Commit 193ff8b1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Catch the -lts branch up with what is in the normal branch.  Changes in
here are:

* 1c9aeb1c Merge tag 'android14-6.1.129_r00' into android14-6.1
* b18db211 ANDROID: GKI: Update rockchip symbols for drm driver.
* f6281360 ANDROID: ABI: Update pixel symbol list
* 2fb96ec8 ANDROID: vendor_hook: add vendor hook on calculate_totalreserve_pages
* 5145d157 ANDROID: GKI: update symbol list file for xiaomi
* 2f4537ba ANDROID: vendor_hooks: Skip pages with high memory pressure in shrink_active_list
* da6a42c1 FROMGIT: mm/page_alloc: add trace event for totalreserve_pages calculation
* 95baed16 BACKPORT: FROMGIT: mm/page_alloc: add trace event for per-zone lowmem reserve setup
* 9d630517 BACKPORT: FROMGIT: mm/page_alloc: add trace event for per-zone watermark setup
* 7da329f7 ANDROID: Update the ABI symbol list
* d3b0aaa0 ANDROID: Add EXPORT_SYMBOL_GPL for folio_mapcount
* 6bd3e435 UPSTREAM: f2fs: fix inconsistent dirty state of atomic file
* 2afd0800 UPSTREAM: net: avoid race between device unregistration and ethnl ops
* 92ada4b4 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0
* cd0ebcd1 UPSTREAM: vsock: Orphan socket after transport release
* 7f11cc02 UPSTREAM: vsock: Keep the binding until socket destruction
* e2647b0f UPSTREAM: bpf, vsock: Invoke proto::close on close()
* cfa792a7 FROMGIT: f2fs: fix to avoid atomicity corruption of atomic file
* f3c4686f ANDROID: abi_gki_aarch64_qcom: Add xas_load
* 33c9d484 ANDROID: Update the ABI symbol list
* 0ad7fae6 ANDROID: printk: add vendor hook to logging during hibernation
* 4da91a8e BACKPORT: FROMGIT: f2fs: fix to avoid running out of free segments
* 64560e78 BACKPORT: FROMGIT: f2fs: fix to avoid panic once fallocation fails for pinfile
* 27895588 BACKPORT: f2fs: compress: fix inconsistent update of i_blocks in release_compress_blocks and reserve_compress_blocks
* 70d032fb ANDROID: GKI: Add KMI symbol list for zebra
* efd0bedd ANDROID: GKI: Update rockchip symbols for drm driver.
* 69a6dfc9 ANDROID: GKI: Update symbol list for mtk
* 9bcabbda ANDROID: userfaultfd: add MOVE ioctl mode to confirm bug-fixes
* 8d8d44ff FROMGIT: userfaultfd: fix PTE unmapping stack-allocated PTE copies
* af439acc FROMGIT: userfaultfd: do not block on locking a large folio with raised refcount
* 7d6124b6 FROMGIT: BACKPORT: mm: fix kernel BUG when userfaultfd_move encounters swapcache
* 44db4837 ANDROID: Update the ABI symbol list
* 50eddb3f FROMGIT: f2fs: set highest IO priority for checkpoint thread
* 471a10d3 ANDROID: mm/memfd-ashmem-shim: Fix variable length array usage
* 6b227a1f ANDROID: GKI: Update symbol list for xiaomi
* eaffa3e3 ANDROID: mm: add a new vendor hook in filemap_map_pages
* fa3cc111 ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM
* 6355ece3 ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler
* 004c3132 ANDROID: mm/memfd-ashmem-shim: Introduce shim layer
* b4fef391 ANDROID: ashmem: Add toggle to ignore requests to deny PROT_EXEC mappings
* ef10c0ef ANDROID: ashmem: Add toggle to ignore requests to deny PROT_READ mappings
* 9f6b96df ANDROID: ashmem: Add support for disabling unpinning feature
* 4deb2cd7 ANDROID: Update the ABI symbol list
* 75c1d11b ANDROID: swapfile: Add EXPORT_SYMBOL_GPL for page_swap_info
* f27efe75 UPSTREAM: io_uring: fix io_req_prep_async with provided buffers
* 719cffaa ANDROID: GKI: Update symbol list for BCMSTB
* 6ad8aa12 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 45755ee7 ANDROID: of: add export symbol for of_update_property
* cf7683f7 ANDROID: GKI: Update oplus symbol list

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