Commit 66b0293d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android15-6.6 into android15-6.6-lts



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

It contains the following commits:

* 2dabc476 FROMGIT: pinmux: fix race causing mux_owner NULL with active mux_usecount
* fe630a04 FROMGIT: f2fs: introduce reserved_pin_section sysfs entry
* 615449fb ANDROID: GKI: Update symbol list for xiaomi
* 7f4572a6 ANDROID: export folio_deactivate() for GKI purpose.
* 46e26901 FROMGIT: exfat: fdatasync flag should be same like generic_write_sync()
* 789dd354 ANDROID: KVM: arm64: Don't update IOMMU under memory pressure
* f99b0f6d ANDROID: KVM: arm64: Increase the pkvm reclaim buffer size
* 9e89b97c Revert "ANDROID: Track per-process dmabuf RSS"
* b1eeaed7 Revert "ANDROID: Track per-process dmabuf RSS HWM"
* 30cf816a Revert "ANDROID: Track per-process dmabuf PSS"
* ad0b76e6 Revert "ANDROID: fixup task_struct to avoid ABI breakage"
* b26826e8 Revert "ANDROID: fixup dma_buf struct to avoid ABI breakage"
* 1f021348 Revert "ANDROID: Add dmabuf RSS trace event"
* a9597c7b ANDROID: GKI: Update symbol list for Amlogic
* c8fdc081 ANDROID: Add dmabuf RSS trace event
* e9f7ac1c ANDROID: fixup dma_buf struct to avoid ABI breakage
* 59af1287 ANDROID: fixup task_struct to avoid ABI breakage
* 0bf76c53 ANDROID: Track per-process dmabuf PSS
* bddab7cf ANDROID: Track per-process dmabuf RSS HWM
* f44d5937 ANDROID: Track per-process dmabuf RSS
* 250bbe1c ANDROID: GKI: Update symbol list for Pixel Watch
* 96c29dad UPSTREAM: blk-cgroup: check for pd_(alloc|free)_fn in blkcg_activate_policy()
* be36ded3 ANDROID: Revert "cpufreq: Avoid using inconsistent policy->min and policy->max"
* 5f592a62 ANDROID: ABI: Update symbol list for sunxi
* 573a6732 ANDROID: GKI: Update symbols list file for honor White list the vm_normal_folio_pmd
* 949ed5ba ANDROID: mm: export vm_normal_folio_pmd to allow vendors to implement simplified smaps
* 5b1c4cc0 ANDROID: Add the dma header to aarch64 allowlist
* 84bb4ef6 UPSTREAM: usb: gadget: u_serial: Fix race condition in TTY wakeup
* 925ea900 ANDROID: kvm: arm64: add per_cpu/cpuX/trace file
* 65f29573 ANDROID: kvm: arm64: start hypervisor event IDs from 1
* 6d27de40 ANDROID: KVM: arm64: use hyp_trace_raw_fops for trace_pipe_raw
* 326b0bd6 BACKPORT: FROMGIT: sched/core: Fix migrate_swap() vs. hotplug
* cc8b083f ANDROID: ABI: Update pixel symbol list
* 6d61bc2d ANDROID: restricted vendor_hook: add swap_readpage_bdev_sync
* 2bc32748 BACKPORT: mm: page_alloc: tighten up find_suitable_fallback()
* b5b61c9e BACKPORT: mm: page_alloc: speed up fallbacks in rmqueue_bulk()
* ae27d6c7 UPSTREAM: mm/page_alloc: clarify should_claim_block() commentary
* 59eb9539 BACKPORT: mm/page_alloc: clarify terminology in migratetype fallback code
* c746bc19 BACKPORT: mm: page_alloc: group fallback functions together
* 707dfe67 UPSTREAM: mm: page_alloc: remove remnants of unlocked migratetype updates
* 65b7c505 BACKPORT: mm: page_alloc: don't steal single pages from biggest buddy
* 4e131ac8 UPSTREAM: mm/page_alloc: add some detailed comments in can_steal_fallback
* bf5861fc UPSTREAM: mm: page_alloc: simpify page del and expand
* f45ef0a0 UPSTREAM: mm: page_alloc: change move_freepages() to __move_freepages_block()
* e0a00524 ANDROID: gki_defconfig: Enable CONFIG_UDMABUF
* cb357138 ANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_NO_IS_READ_ON_H8
* 279274c1 ANDROID: virt: gunyah: Replace arm_smccc_1_1_smc with arm_smccc_1_1_invoke
* 3b5bd541 UPSTREAM: net: fix udp gso skb_segment after pull from frag_list
* 08115cdf UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

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