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

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



This merges all of the latest changes in 'android14-6.1' into
'android14-6.1-lts' to get it to pass TH again due to new symbols being
added.  Included in here are the following commits:

* a41a4ee3 ANDROID: Update the ABI symbol list
* 0801d8a8 ANDROID: mm: export dump_tasks symbol.
* 7c91752f FROMLIST: scsi: ufs: Remove the ufshcd_hba_exit() call from ufshcd_async_scan()
* 28154afe FROMLIST: scsi: ufs: Simplify power management during async scan
* febcf142 ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y
* bc4d82ee ANDROID: KMI workaround for CONFIG_NETFILTER_FAMILY_BRIDGE
* 227b55a7 ANDROID: dma-buf: don't re-purpose kobject as work_struct
* c1b1201d BACKPORT: FROMLIST: dma-buf: Move sysfs work out of DMA-BUF export path
* 928b3b5d UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
* 031f8041 ANDROID: KVM: arm64: Avoid BUG-ing from the host abort path
* c5dc4b4b ANDROID: Update the ABI symbol list
* 5070b3b5 UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* 02aa7266 UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
* d6554d12 FROMGIT: usb: dwc3: gadget: Handle EP0 request dequeuing properly
* 29544d41 ANDROID: ABI: Update symbol list for imx
* 02f444ba UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
* ec46fe0a UPSTREAM: bpf: Fix prog_array_map_poke_run map poke update
* 98b0e4cf BACKPORT: xhci: track port suspend state correctly in unsuccessful resume cases
* ac90f082 ANDROID: Update the ABI symbol list
* ef67750d ANDROID: sched: Export symbols for vendor modules
* 934a4057 UPSTREAM: usb: dwc3: core: add support for disabling High-speed park mode
* 8a597e7a ANDROID: KVM: arm64: Don't prepopulate MMIO regions for host stage-2
* ed9b660c BACKPORT: FROMGIT fork: use __mt_dup() to duplicate maple tree in dup_mmap()
* 3743b40f FROMGIT: maple_tree: preserve the tree attributes when destroying maple tree
* 1bec2dd5 FROMGIT: maple_tree: update check_forking() and bench_forking()
* e57d3335 FROMGIT: maple_tree: skip other tests when BENCH is enabled
* c79ca61e FROMGIT: maple_tree: update the documentation of maple tree
* 7befa7bb FROMGIT: maple_tree: add test for mtree_dup()
* f73f881a FROMGIT: radix tree test suite: align kmem_cache_alloc_bulk() with kernel behavior.
* eb5048ea FROMGIT: maple_tree: introduce interfaces __mt_dup() and mtree_dup()
* dc932354 FROMGIT: maple_tree: introduce {mtree,mas}_lock_nested()
* 4ddcdc51 FROMGIT: maple_tree: add mt_free_one() and mt_attr() helpers
* c52d4881 UPSTREAM: maple_tree: introduce __mas_set_range()
* 066d57de ANDROID: GKI: Enable symbols for v4l2 in async and fwnode
* e7441783 ANDROID: Update the ABI symbol list
* 15a93de4 ANDROID: KVM: arm64: Fix hyp event alignment
* 717d1f8f ANDROID: KVM: arm64: Fix host_smc print typo
* 8fc25d78 FROMGIT: f2fs: do not return EFSCORRUPTED, but try to run online repair
* 99288e91 ANDROID: KVM: arm64: Document module_change_host_prot_range
* 4d99e41c FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
* 6c8f7108 FROMGIT: arch/mm/fault: fix major fault accounting when retrying under per-VMA lock
* 4a518d86 UPSTREAM: mm: handle write faults to RO pages under the VMA lock
* c1da94fa UPSTREAM: mm: handle read faults under the VMA lock
* 6541fffd UPSTREAM: mm: handle COW faults under the VMA lock
* c7fa581a UPSTREAM: mm: handle shared faults under the VMA lock
* 95af8a80 BACKPORT: mm: call wp_page_copy() under the VMA lock
* b43b26b4 UPSTREAM: mm: make lock_folio_maybe_drop_mmap() VMA lock aware
* 9c4bc457 UPSTREAM: mm/memory.c: fix mismerge
* 7d50253c ANDROID: Export functions to be used with dma_map_ops in modules
* 37e0a5b8 BACKPORT: FROMGIT: erofs: enable sub-page compressed block support
* f466d521 FROMGIT: erofs: refine z_erofs_transform_plain() for sub-page block support
* a18efa4e FROMGIT: erofs: fix ztailpacking for subpage compressed blocks
* 0c6a18c7 BACKPORT: FROMGIT: erofs: fix up compacted indexes for block size < 4096
* d7bb85f1 FROMGIT: erofs: record `pclustersize` in bytes instead of pages
* 9d259220 FROMGIT: erofs: support I/O submission for sub-page compressed blocks
* 8a49ea94 FROMGIT: erofs: fix lz4 inplace decompression
* bdc5d268 FROMGIT: erofs: fix memory leak on short-lived bounced pages
* 0d329bbe BACKPORT: erofs: tidy up z_erofs_do_read_page()
* dc94c3cc UPSTREAM: erofs: move preparation logic into z_erofs_pcluster_begin()
* 7751567a BACKPORT: erofs: avoid obsolete {collector,collection} terms
* d0dbf747 BACKPORT: erofs: simplify z_erofs_read_fragment()
* 4067dd99 UPSTREAM: erofs: get rid of the remaining kmap_atomic()
* 365ca16d UPSTREAM: erofs: simplify z_erofs_transform_plain()
* 187d0345 BACKPORT: erofs: adapt managed inode operations into folios
* 3d931826 UPSTREAM: erofs: avoid on-stack pagepool directly passed by arguments
* 5c182738 UPSTREAM: erofs: allocate extra bvec pages directly instead of retrying
* bed20ed1 UPSTREAM: erofs: clean up z_erofs_pcluster_readmore()
* 5e861fa9 UPSTREAM: erofs: remove the member readahead from struct z_erofs_decompress_frontend
* 66595bb1 UPSTREAM: erofs: fold in z_erofs_decompress()
* 88a19395 UPSTREAM: erofs: enable large folios for iomap mode
* 2c085909 ANDROID: Update the ABI symbol list
* d16a15fd UPSTREAM: USB: gadget: core: adjust uevent timing on gadget unbind
* d3006fb9 ANDROID: ABI: Update oplus symbol list
* bc97d501 ANDROID: vendor_hooks: Add hooks for rt_mutex steal
* 401a2769 UPSTREAM: dm verity: don't perform FEC for failed readahead IO
* 30bca9e2 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
* 44702d8f FROMLIST: mm: migrate high-order folios in swap cache correctly
* 613d8368 ANDROID: fuse-bpf: Follow mounts in lookups

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