Commit 1bd56c7d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android15-6.6' into android15-6.6-lts



Catch up with the big backmerge in order to sync up with everything.
Changes included in here include:

* 375ddbe9 ANDROID: KVM: arm64: Fix hyp module base address in pkvm_el2_mod_va()
* 54fe7d36 Merge tag 'android15-6.6.46_r00' into android15-6.6
* d9de370e UPSTREAM: mm: zswap: fix zswap_never_enabled() for CONFIG_ZSWAP==N
* e603a53e BACKPORT: mm: zswap: add zswap_never_enabled()
* 6bdb6c7c BACKPORT: mm/vmscan: drop checking if _deferred_list is empty before using TTU_SYNC
* 66f7137c BACKPORT: mm: remove folio_test_anon(folio)==false path in __folio_add_anon_rmap()
* 7882adc2 UPSTREAM: mm: use folio_add_new_anon_rmap() if folio_test_anon(folio)==false
* 870700e4 BACKPORT: mm: extend rmap flags arguments for folio_add_new_anon_rmap
* 4c68f621 BACKPORT: mm: remove page_add_new_anon_rmap and lru_cache_add_inactive_or_unevictable
* 49882603 BACKPORT: wifi: mac80211: Use flexible array in struct ieee80211_tim_ie
* cfdfb5e0 UPSTREAM: mm: convert collapse_huge_page() to use a folio
* 297debad UPSTREAM: mm: convert migrate_vma_insert_page() to use a folio
* b2debfc1 BACKPORT: mm: remove references to page_add_new_anon_rmap in comments
* 453679c5 UPSTREAM: mm: remove stale example from comment
* 10338a2e BACKPORT: mm: convert unuse_pte() to use a folio throughout
* 38de31bd BACKPORT: mm: remove PageAnonExclusive assertions in unuse_pte()
* fe52579d UPSTREAM: mm: convert ksm_might_need_to_copy() to work on folios
* 7f4f768e ANDROID: GKI: update symbol list for honor
* b4a27402 ANDROID: GKI: modify vendor hook name for Honor ogki
* 561b551d ANDROID: KVM: arm64: Remove unnecessary stage2_unmap_clear_pte from stage2_make_pte
* 459097f3 ANDROID: KVM: arm64: Disallow kvm_pgtable_stage2_unmap on host S2
* 34fc61f8 FROMGIT: BACKPORT: KVM: arm64: Don't pass a TLBI level hint when zapping table entries
* 517b52f7 FROMGIT: BACKPORT: KVM: arm64: Don't defer TLB invalidation when zapping table entries
* dbaa197d FROMGIT: KVM: arm64: Ensure TLBI uses correct VMID after changing context
* c7e69c2c FROMGIT: KVM: arm64: Invalidate EL1&0 TLB entries for all VMIDs in nvhe hyp init
* 3f4c0346 ANDROID: drivers/arm-smmu-v3-kvm: Add SMMUs to domain for live devices
* 341b6a0a ANDROID: drivers/arm-smmu-v3-kvm: Invalidate ASID/VMID on detach
* 396901e4 ANDROID: drivers/arm-smmu-v3-kvm: Ensure domain_id is in range
* b7d3ae5e ANDROID: drivers/arm-smmu-v3-kvm: Fix wrong type cast in capable
* 98fd8375 ANDROID: GKI: Add symbol to symbol list for imx
* 08b53b0b ANDROID: Add CtsCameraTestCases to the kernel-presubmit group
* b42ed947 FROMLIST: binder: fix UAF caused by offsets overwrite
* cfd01b50 BACKPORT: binder: remove redundant variable page_addr
* 8da6283e ANDROID: GKI: Update symbols to symbol list for honor
* d21d6562 ANDROID: signal: Add vendor hook for memory reap
* a94ba5ab BACKPORT: timekeeping: Use READ/WRITE_ONCE() for tick_do_timer_cpu
* 4b38cee3 ANDROID: GKI: Update symbols to symbol list
* 65ebb00f ANDROID: vendor_hooks: add hook to perform targeted memory management
* 800cd291 ANDROID: ABI: update symbol list for honor
* 0517467c ANDROID: vendor_hooks: add hook to optimize the madvise processing flow
* d974a8b6 ANDROID: GKI: Update symbol list for mtk
* e7c05152 BACKPORT: thermal: gov_power_allocator: Avoid overwriting PID coefficients from setup time
* bea8a4ba UPSTREAM: scsi: ufs: Uninitialized variable in ufshcd_devfreq_target()
* 1896bfd9 UPSTREAM: pmdomain: arm: Fix NULL dereference on scmi_perf_domain removal
* 9b2996c7 UPSTREAM: mm/userfaultfd: UFFDIO_MOVE implementation should use ptep_get()
* 82094b2e UPSTREAM: ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
* 837cb4d2 UPSTREAM: usb: gadget: uvc: Remove nested locking
* d897e12e UPSTREAM: pmdomain: arm: Avoid polling for scmi_perf_domain
* 6dcad5bb FROMLIST: scsi: ufs: core: Fix the code for entering hibernation
* 4c0eff91 FROMLIST: scsi: ufs: core: Make ufshcd_uic_cmd_compl() easier to read
* b7459d59 FROMGIT: rcu/nocb: Fix RT throttling hrtimer armed from offline CPU
* 3921b713 ANDROID: GKI: update symbol list for honor
* eba98a6e ANDROID: GKI: Add vendor hook define for Honor ogki
* d9ce6b0b ANDROID: Add sound/usb/card.h to aarch64 allowlist
* bdd9aa1d ANDROID: Add aoc-usb headers to aarch64 allowlist
* 6c3bccd3 ANDROID: GKI: Update symbol list for vivo
* 3cfe1de3 FROMGIT: tcp: Update window clamping condition
* c8968f29 ANDROID: vendor_hooks: Fix incorrect declaration of restricted hook
* 1933a7b8 ANDROID: GKI: Update symbols to symbol list
* 0d9cb951 ANDROID: GKI: Add hooks for socket management.
* dbfe4cdf FROMGIT: workqueue: add cmdline parameter workqueue.panic_on_stall
* 24fc5d66 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 2041959e ANDROID: vendor_hooks: add hook in create_worker()
* aeaa3ba9 ANDROID: KVM: Fix fast-forward size in pkvm_mem_abort_range()

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