Commit 85f5e82f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android14-6.1 into android14-6.1-lts



This merges the android14-6.1 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 684ae9ba Merge tag 'android14-6.1.147_r00' into android14-6.1
* 02ca8100 ANDROID: GKI: update symbol list file for xiaomi
* a6492b47 ANDROID: vendor_hooks: Add alloc_factor to pcp allocation and release
* 376207d1 ANDROID: PM: Support to abort suspend during filesystem sync
* 4b2d8222 ANDROID: Use ABI reservations for dmabuf RSS / PSS accounting
* 1b269f8e ANDROID: Track per-process dmabuf PSS
* c8372adc ANDROID: Add dmabuf RSS trace event
* d66f4ee1 ANDROID: Track per-process dmabuf RSS HWM
* 060742b3 ANDROID: Track per-process dmabuf RSS
* 816469ee ANDROID: add task_dma_buf_record and allocation preload facilities
* debde51a ANDROID: GKI: Update symbol list for vivo
* 4373bc5d ANDROID: vendor_hooks: add hook in __dev_pm_qos_update_request()
* 17c227d1 ANDROID: ABI: Update the symbol list for mtk
* 47b374a1 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* ad275ef0 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* 397bc5b3 ANDROID: 16K: Allocate pad vma on the stack
* ed87b529 Revert "ANDROID: 16K: Use vma_area slab cache for pad VMA"
* 26fad7be ANDROID: abi_gki_aarch64_qcom: Add PCIe framework related symbols
* 87b9d836 Revert "ANDROID: add task_dma_buf_record and allocation preload facilities"
* 2f756461 Revert "ANDROID: Track per-process dmabuf RSS"
* e2389edd Revert "ANDROID: Track per-process dmabuf RSS HWM"
* 62046d5b Revert "ANDROID: Track per-process dmabuf PSS"
* 511dadc8 Revert "ANDROID: fixup task_struct to avoid ABI breakage"
* 87902f3a Revert "ANDROID: fixup dma_buf struct to avoid ABI breakage"
* e63766c3 Revert "ANDROID: Add dmabuf RSS trace event"
* 0f6e7cde Revert "ANDROID: fix dmabuf accounting deadlock issue"
* c29b5e87 Revert "ANDROID: fix dmabuf accounting lockdep checking"
* 831a57b4 ANDROID: GKI: Update oplus symbol list
* cd2179ec ANDROID: vendor_hooks: add hooks in cpu_cgroup subsystem
* 82186ba3 ANDROID: vendor_hooks: Add hooks in reweight_entity
* 71be5f6b ANDROID: GKI: Export css_task_iter_start()
* c750dc58 ANDROID: gunyah: Fix use-after-free in gunyah_vm_clean_resources()
* 39fefc4d BACKPORT: mm: userfaultfd: fix race of userfaultfd_move and swap cache
* 39e817cf ANDROID: ABI: Update the symbol list for mtk
* 3b4ff5af ANDROID: abi_gki_aarch64_qcom: whitelist some mm symbols
* 2bd17a67 ANDROID: mm: vmalloc: export vmap_ apis
* 4a6a5e5d ANDROID: fix dmabuf accounting lockdep checking
* c38b6299 ANDROID: fix dmabuf accounting deadlock issue
* 655fe292 ANDROID: Add dmabuf RSS trace event
* 96d9ec43 ANDROID: fixup dma_buf struct to avoid ABI breakage
* 80ea2251 ANDROID: fixup task_struct to avoid ABI breakage
* 3d9cc6d7 ANDROID: Track per-process dmabuf PSS
* d3524510 ANDROID: Track per-process dmabuf RSS HWM
* 2b2a8f54 ANDROID: Track per-process dmabuf RSS
* 65a74eb4 ANDROID: add task_dma_buf_record and allocation preload facilities
* 42472e1a ANDROID: GKI: Update symbol list for vivo
* 7be3f9b6 ANDROID: vendor_hooks: add hook in create_worker()
* e2861c11 ANDROID: GKI: Update symbol list for bcmstb
* 12ce99d3 UPSTREAM: net: add netdev_sw_irq_coalesce_default_on()
* 2245c50c ANDROID: ABI: update symbol list for vivo
* fd41c491 ANDROID: Backport: add hook before batch free into pcp
* 93d592fa ANDROID: Backport: page_alloc: add vendor hook to try alloc pages
* 19fbea31 ANDROID: KVM: arm64: Don't copy pvmfw pages more than once
* a46573cd ANDROID: KVM: arm64: Set unknown bits of VBAR_EL1
* 0a4b6d37 ANDROID: bpf: do not fail to load if log is full
* 2487417f BACKPORT: Add support for PIO p flag
* 80964585 ANDROID: KVM: arm64: poison/account relinquished pages after unmap

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