Commit 2b26f9c3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android14-6.1' into android14-6.1-lts



Merge into the lts branch the recent changes made to the main branch:

* a4fc1bef Merge tag 'android14-6.1.134_r00' into android14-6.1
* 25fc41bb ANDROID: GKI: Update symbol list for mtk
* f26d229e ANDROID: Repurpose a reserved slot in ipv6_devconf for backports
* 70d64865 ANDROID: userfaultfd: adjust MOVE ioctl mode to confirm bug-fix
* d8a28dde BACKPORT: mm/rmap: move SetPageAnonExclusive() out of page_move_anon_rmap()
* 6a8cf132 ANDROID: GKI: Update symbol list for bcmstb
* 642656a3 ANDROID: GKI: Honor add symbols to symbol list
* 40610f49 ANDROID: vendor hooks: add hook record workingset refault count
* 9a57b389 FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
* bc3d1d35 ANDROID: GKI: update symbol list for xiaomi
* 6684cdb3 ANDROID: GKI: update symbol list file for xiaomi
* 05899bf3 ANDROID: GKI: Update symbol list for xiaomi
* 82120664 ANDROID: Export cgroup function to allow module to remove control files
* c0b27cdc ANDROID: mm: export mem_cgroup_move_account
* ff55f3e7 ANDROID: mm: add vendor hook to trace shrink_node
* f2a18f18 ANDROID: mm: add vendor hook to add folio to specific memcg
* e63d8c31 ANDROID: f2fs: fix incorrect merge resolution in f2fs_trace_rw_file_path()
* efda22f3 ANDROID: GKI: update symbol list for xiaomi
* 19a0fb1d ANDROID: abi_gki_aarch64_qcom: Update symbol list for display HFI driver
* 37c227e8 UPSTREAM: bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags
* 44009cb8 ANDROID: GKI: Update symbol list for mtk
* 777d8313 UPSTREAM: regset: use kvzalloc() for regset_get_alloc()
* 6bd3b482 ANDROID: sched: Reapply reverted portions of "sched/core: Prevent race condition between cpuset and __sched_setscheduler()"
* ca24c52e Revert "ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode"
* 3e6e324f UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another
* df2dac40 ANDROID: GKI: Update symbol list for xiaomi
* 4fc6483e ANDROID: vendor_hook: Add hook is to optimize the time consumption of shrink slab.
* c1fd5026 ANDROID: GKI: Update symbol list for mtk
* e1ab072b UPSTREAM: usb: gadget: core: flush gadget workqueue after device removal

Change-Id: I59577162c2499090fea1240176e7e9ecd952bb41
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5a2ca52a a4fc1bef
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment