Commit e6f212b3 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:

* 3a0107a3 ANDROID: KVM: arm64: Ensure SVE initialization precedes PSCI for protected VCPUs
* 3b751033 ANDROID: 16K: Use vma_area slab cache for pad VMA
* a213abad UPSTREAM: af_unix: Fix uninit-value in __unix_walk_scc()
* 5156d49e UPSTREAM: af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS
* fbd78336 ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'dead'
* ddd6979a UPSTREAM: af_unix: Add dead flag to struct scm_fp_list.
* 95a397ac UPSTREAM: af_unix: Don't access successor in unix_del_edges() during GC.
* a130d07d UPSTREAM: af_unix: Try not to hold unix_gc_lock during accept().
* 5ada2880 UPSTREAM: af_unix: Remove lock dance in unix_peek_fds().
* 11d208f8 UPSTREAM: af_unix: Replace garbage collection algorithm.
* 67a3a58d UPSTREAM: af_unix: Detect dead SCC.
* b9f8dfdb UPSTREAM: af_unix: Assign a unique index to SCC.
* b22b0a75 UPSTREAM: af_unix: Avoid Tarjan's algorithm if unnecessary.
* 1e4d62ad UPSTREAM: af_unix: Skip GC if no cycle exists.
* 250c362a UPSTREAM: af_unix: Save O(n) setup of Tarjan's algo.
* 0c40a051 UPSTREAM: af_unix: Fix up unix_edge.successor for embryo socket.
* f5ea8b43 UPSTREAM: af_unix: Save listener for embryo socket.
* 279ed20d UPSTREAM: af_unix: Detect Strongly Connected Components.
* 16dca903 UPSTREAM: af_unix: Iterate all vertices by DFS.
* 80df4d17 UPSTREAM: af_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb.
* 40549e69 ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'inflight'
* 769fc01f UPSTREAM: af_unix: Link struct unix_edge when queuing skb.
* de6b1e85 ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'edges'
* 844c9666 UPSTREAM: af_unix: Allocate struct unix_edge for each inflight AF_UNIX fd.
* c93b3ba5 ANDROID: af_unix: Provide ABI fixes for recently introduced 'struct scm_fp_list' attribute 'vertices'
* ffef32dd UPSTREAM: af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd.
* f972f2d7 ANDROID: af_unix: Allocate memory for the largest possible size of 'struct scm_fp_list'
* b077571d UPSTREAM: af_unix: Remove CONFIG_UNIX_SCM.
* a390e627 ANDROID: Align x86-64 microdroid cgroup support with aarch64 microdroid
* 6dbb3c2e BACKPORT: mm: remove folio from deferred split list before uncharging it
* a8553b4e BACKPORT: mm: use __page_cache_release() in folios_put()
* 4d61851d UPSTREAM: mm: fix list corruption in put_pages_list
* f61f355b UPSTREAM: mm: use free_unref_folios() in put_pages_list()
* 316b2e6e BACKPORT: mm: remove use of folio list from folios_put()
* f9c6fb1b BACKPORT: memcg: add mem_cgroup_uncharge_folios()
* 3bc695b2 Merge tag 'android15-6.6.92_r00' into android15-6.6
* 08134410 FROMGIT: scsi: core: ufs: Fix a hang in the error handler
* a74f0521 FROMGIT: genirq/cpuhotplug: Restore affinity even for suspended IRQ
* fc6844d9 FROMGIT: genirq/cpuhotplug: Rebalance managed interrupts across multi-CPU hotplug
* 0bc63a98 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* 8fb77f6f ANDROID: mm: Reset unused page flag bits on free
* f0bd864f Revert "ANDROID: mm: Set PAGE_BLOCK_ORDER to 7 when ARM64_16K_PAGES"
* 97f5b70a ANDROID: GKI: Update symbol list for xiaomi
* 2bc7bc93 BACKPORT: erofs: lazily initialize per-CPU workers and CPU hotplug hooks
* 434940a4 FROMGIT: scsi: ufs: mcq: Delete ufshcd_release_scsi_cmd() in ufshcd_mcq_abort()
* 0ac9aa9b ANDROID: GKI: Rename xring's symbol list.
* f56b0532 BACKPORT: mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled
* f1949463 ANDROID: GKI: Update symbol list for vivo
* 68191d9c ANDROID: vendor_hooks: add hook to retry mempool allocation without delay
* 45afa562 ANDROID: mm: Set PAGE_BLOCK_ORDER to 7 when ARM64_16K_PAGES
* 3148030c ANDROID: KVM: arm64: Fix hyp_alloc(0)
* 4ec55296 ANDROID: fix out-of-bounds error when trace_create_new_event
* d9ec0e18 ANDROID: CONFIG_CRYPTO_SHA1_ARM64_CE=y to GKI and Microdroid kernel
* 0272a2ff BACKPORT: FROMGIT: mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order
* 86ba3f3e BACKPORT: binder: Create safe versions of binder log files
* 8a55e7a0 UPSTREAM: binder: Refactor binder_node print synchronization
* fe02cfa1 ANDROID: iommu/arm-smmu-v3-kvm: Fix accidental domain ID freeing in free()
* 9733cd1f ANDROID: GKI: Update xiaomi symbol list.
* 125f87a1 UPSTREAM: mm/memcg: use kmem_cache when alloc memcg pernode info
* 78e6a3d4 UPSTREAM: mm/memcg: use kmem_cache when alloc memcg
* b6bde4b6 UPSTREAM: mm/memcg: move mem_cgroup_init() ahead of cgroup_init()
* 476cb9bc UPSTREAM: af_unix: Remove io_uring code for GC.
* fb219cbb UPSTREAM: af_unix: Replace BUG_ON() with WARN_ON_ONCE().
* 3c392193 ANDROID: Enable memory controller for microdroid
* c6325b07 ANDROID: cgroup: Fix cgroup_root backport padding calculation
* 452d899d ANDROID: GKI: Fix up abi issue in struct scm_fp_list
* cec9cb02 UPSTREAM: af_unix: Try to run GC async.
* 93c2d241 BACKPORT: FROMGIT: usb: typec: tcpm: move tcpm_queue_vdm_unlocked to asynchronous work
* ee016b98 BACKPORT: usb: typec: tcpm: enforce ready state when queueing alt mode vdm
* 4be94a6b ANDROID: ABI: Update pixel symbol list
* 6af2e78f ANDROID: fix ABI breakage for trace_array extensions
* 6f62c0d0 UPSTREAM: tracing: Allow creating instances with specified system events
* f8d73c61 UPSTREAM: af_unix: Run GC on only one CPU.
* a70bd568 UPSTREAM: af_unix: Return struct unix_sock from unix_get_socket().
* c1b974e5 UPSTREAM: iommu: Handle race with default domain setup
* 315fdde4 ANDROID: ABI: Update pixel symbol list
* 32288ce2 ANDROID: vendor_hooks: Add hooks for xhci reset
* dd8fcb53 ANDROID: GKI: deferred split queue corruption - ABI fixup
* 374babec UPSTREAM: mm/thp: fix deferred split queue not partially_mapped: fix
* 3a8faa5b BACKPORT: mm/thp: fix deferred split unqueue naming and locking
* 84cc3546 UPSTREAM: mm/thp: fix deferred split queue not partially_mapped
* dd46964f BACKPORT: mm: add sysfs entry to disable splitting underused THPs
* 40ffd525 UPSTREAM: mm: split underused THPs
* a63eadb1 BACKPORT: mm: introduce a pageflag for partially mapped folios
* f1b73b05 UPSTREAM: mm/migrate: fix kernel BUG at mm/compaction.c:2761!
* cbbd1530 BACKPORT: mm/migrate: split source folio if it is on deferred split list
* c6f085c3 BACKPORT: mm: count the number of partially mapped anonymous THPs per size
* 545db609 BACKPORT: mm: count the number of anonymous THPs per size
* 6ee860d0 UPSTREAM: mm: separate out FOLIO_FLAGS from PAGEFLAGS
* f052bbc2 UPSTREAM: mm: selftest to verify zero-filled pages are mapped to zeropage
* d826c844 BACKPORT: mm: remap unused subpages to shared zeropage when splitting isolated thp
* bc9f1a0f Revert "BACKPORT: mm/thp: fix deferred split unqueue naming and locking"
* c06fa3b5 ANDROID: GKI: page_alloc ABI fixup
* 819bdc71 BACKPORT: mm: page_alloc: batch vmstat updates in expand()
* c97dfdfa UPSTREAM: mm/page_alloc: keep track of free highatomic
* cdff4faf UPSTREAM: mm: remove unused has_isolate_pageblock
* 5b5902fc UPSTREAM: mm: page_alloc: fix highatomic typing in multi-block buddies
* 48e8763a BACKPORT: mm: page_alloc: consolidate free page accounting
* a4f7bd4b BACKPORT: mm: page_isolation: prepare for hygienic freelists
* a8dcfbc6 UPSTREAM: mm: page_alloc: set migratetype inside move_freepages()
* 209c219a BACKPORT: mm: page_alloc: close migratetype race between freeing and stealing
* 1a3654f5 BACKPORT: mm: page_alloc: fix freelist movement during block conversion
* 861e9d3c UPSTREAM: mm: page_alloc: fix move_freepages_block() range error
* 350c3b1d UPSTREAM: mm: page_alloc: move free pages when converting block during isolation
* f7629915 UPSTREAM: mm: page_alloc: fix up block types when merging compatible blocks
* cb610236 UPSTREAM: mm: page_alloc: optimize free_unref_folios()
* 606130da BACKPORT: mm: page_alloc: remove pcppage migratetype caching
* a7a880e6 UPSTREAM: mm: allow non-hugetlb large folios to be batch processed
* f17c4db9 BACKPORT: mm: handle large folios in free_unref_folios()
* c7f67cfb UPSTREAM: mm: use folios_put() in __folio_batch_release()
* 445fa9a7 BACKPORT: mm: add free_unref_folios()
* cc058410 BACKPORT: mm: convert free_unref_page_list() to use folios
* 980cb4e2 BACKPORT: mm: make folios_put() the basis of release_pages()
* 5f4ed005 Revert "BACKPORT: mm: page_alloc: remove pcppage migratetype caching"
* bab99c1b Revert "UPSTREAM: mm: page_alloc: fix up block types when merging compatible blocks"
* 94e3afbb Revert "UPSTREAM: mm: page_alloc: move free pages when converting block during isolation"
* 13aa1518 Revert "UPSTREAM: mm: page_alloc: fix move_freepages_block() range error"
* d47518de Revert "UPSTREAM: mm: page_alloc: fix freelist movement during block conversion"
* 135ab737 Revert "BACKPORT: mm: page_alloc: close migratetype race between freeing and stealing"
* 9ed2d2fb Revert "UPSTREAM: mm: page_alloc: set migratetype inside move_freepages()"
* efbdb11a Revert "BACKPORT: mm: page_isolation: prepare for hygienic freelists"
* 7d424e0f Revert "BACKPORT: mm: page_alloc: consolidate free page accounting"
* 8a91cd1d Revert "BACKPORT: mm: page_alloc: batch vmstat updates in expand()"
* be6d3cc0 Revert "UPSTREAM: mm: page_alloc: fix highatomic typing in multi-block buddies"
* bbc65a78 Revert "BACKPORT: mm/page_alloc: keep track of free highatomic"
* a7a0d95b Revert "BACKPORT: mm: page_alloc: optimize free_unref_folios()"
* 8b5d78fb Revert "ANDROID: fuse-bpf: fix wrong logic in read backing"
* c1488e58 ANDROID: GKI: Update symbol list for Nvidia
* 1e3d640b ANDROID: GKI: Add initial Nvidia symbol list
* 5fa476bd ANDROID: Add ufs headers to aarch64 allowlist
* 17daf81b ANDROID: KVM: arm64: Allow relinqush for p-guest with huge-mappings
* 297e1ff8 ANDROID: KVM: arm64: Use unmap for pKVM guests memory relinquish
* 7c95a219 ANDROID: KVM: arm64: Add hyp request SPLIT
* e56d1813 ANDROID: KVM: arm64: Convert kvm_pinned_pages to an interval-tree
* 390699f9 ANDROID: KVM: arm64: Add host_split_guest for pKVM
* 16df80ab ANDROID: KVM: arm64: Disable relinquish for p-guest huge-mappings
* 549ac47c FROMGIT: PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn()
* 4cdfd02f ANDROID: Enable SHA1 for microdroid
* ab0ad8d1 BACKPORT: mm: page_alloc: optimize free_unref_folios()

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