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

Catches the android14-6.1-lts branch up with the android14-6.1 branch
which has had a lot of changes that are needed here to resolve future
LTS merges and to ensure that the ABI is kept stable.

It contains the following commits:

* 9fd41ac1 ANDROID: Delete build.config.gki.aarch64.16k.
* 073df44c FROMGIT: usb: typec: tcpm: Refactor the PPS APDO selection
* 078410e7 UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
* 722f6cc0 ANDROID: Revert "ANDROID: allmodconfig: disable WERROR"
* c2611a04 ANDROID: GKI: update symbol list file for xiaomi
* 34fde9ec FROMGIT: usb: typec: tcpm: not sink vbus if operational current is 0mA
* 3ebafb7b BACKPORT: FROMGIT: mm: handle faults that merely update the accessed bit under the VMA lock
* 9e066d4b FROMLIST: mm: Allow fault_dirty_shared_page() to be called under the VMA lock
* 83ab9863 FROMGIT: mm: handle swap and NUMA PTE faults under the VMA lock
* ffcebdef FROMGIT: mm: run the fault-around code under the VMA lock
* 072c35fb FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check down from do_fault()
* fa9a8adf FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check down in handle_pte_fault()
* dd621869 BACKPORT: FROMGIT: mm: handle some PMD faults under the VMA lock
* 8594d6a3 BACKPORT: FROMGIT: mm: handle PUD faults under the VMA lock
* 66cbbe6b FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check from handle_mm_fault()
* e2604476 BACKPORT: FROMGIT: mm: allow per-VMA locks on file-backed VMAs
* 4cb518a0 FROMGIT: mm: remove CONFIG_PER_VMA_LOCK ifdefs
* f4b32b7f FROMGIT: mm: fix a lockdep issue in vma_assert_write_locked
* 250f1977 FROMGIT: mm: handle userfaults under VMA lock
* e704d0e4 FROMGIT: mm: handle swap page faults under per-VMA lock
* f8a65b69 FROMGIT: mm: change folio_lock_or_retry to use vm_fault directly
* 693d905e BACKPORT: FROMGIT: mm: drop per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED
* 939d4b1c BACKPORT: FROMGIT: mm: move vma locking out of vma_prepare and dup_anon_vma
* 0f0b09c0 BACKPORT: FROMGIT: mm: always lock new vma before inserting into vma tree
* a8a479ed FROMGIT: mm: lock vma explicitly before doing vm_flags_reset and vm_flags_reset_once
* ad189238 FROMGIT: mm: replace mmap with vma write lock assertions when operating on a vma
* 5f0ca924 FROMGIT: mm: for !CONFIG_PER_VMA_LOCK equate write lock assertion for vma and mmap
* abb0f276 FROMGIT: mm: don't drop VMA locks in mm_drop_all_locks()
* 365af746 BACKPORT: riscv: mm: try VMA lock-based page fault handling first
* 3c187b4a BACKPORT: FROMGIT: mm: enable page walking API to lock vmas during the walk
* b6093c47 BACKPORT: mm: lock VMA in dup_anon_vma() before setting ->anon_vma
* 0ee0062c UPSTREAM: mm: fix memory ordering for mm_lock_seq and vm_lock_seq
* 3378cbd2 FROMGIT: usb: host: ehci-sched: try to turn on io watchdog as long as periodic_count > 0
* 2d3351bd FROMGIT: BACKPORT: usb: ehci: add workaround for chipidea PORTSC.PEC bug
* 7fa88611 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* 683966ac UPSTREAM: mm/mmap: Fix extra maple tree write
* f86c79eb FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* 7ae1e02a UPSTREAM: mm: skip CMA pages when they are not available
* 76663252 UPSTREAM: dma-buf: fix an error pointer vs NULL bug
* e61d7612 UPSTREAM: dma-buf: keep the signaling time of merged fences v3
* fda157ce UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* 110a26ed UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* 9db14372 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* 76881029 UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 37f45094 ANDROID: Add checkpatch target.
* d7dacaa4 UPSTREAM: USB: Gadget: core: Help prevent panic during UVC unconfigure
* 4dc009c3 ANDROID: GKI: Update symbols to symbol list
* fadc3592 ANDROID: vendor_hook: fix the error record position of mutex
* 3fc69d3f ANDROID: ABI: add allowed list for galaxy
* a5a66218 ANDROID: gfp: add __GFP_CMA in gfpflag_names
* b520b909 ANDROID: ABI: Update to fix slab-out-of-bounds in xhci_vendor_get_ops
* c2cbb3cc ANDROID: usb: host: fix slab-out-of-bounds in xhci_vendor_get_ops
* 64787ee4 ANDROID: GKI: update pixel symbol list for xhci
* b0c06048 FROMGIT: fs: drop_caches: draining pages before dropping caches
* 2f76bb83 ANDROID: GKI: update symbol list file for xiaomi
* 8e86825e ANDROID: uid_sys_stats: Use a single work for deferred updates
* 960d9828 ANDROID: ABI: Update symbol for Exynos SoC
* 3926cc6e ANDROID: GKI: Add symbols to symbol list for vivo
* dbb09068 ANDROID: vendor_hooks: Add tune scan type hook in get_scan_count()
* 5e1d25ac FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* addf1a9a FROMGIT: Multi-gen LRU: Avoid race in inc_min_seq()
* a7adb988 FROMGIT: Multi-gen LRU: Fix per-zone reclaim
* 03812b90 ANDROID: ABI: update symbol list for galaxy
* b283f9b4 ANDROID: oplus: Update the ABI xml and symbol list
* c3d26e2b ANDROID: vendor_hooks: Add hooks for lookaround
* 29e2f3e3 ANDROID: ABI: Update STG ABI to format version 2
* 3bd3d137 ANDROID: ABI: Update symbol list for imx
* ad0b0081 FROMGIT: erofs: fix wrong primary bvec selection on deduplicated extents
* 126ef64c UPSTREAM: media: Add ABGR64_12 video format
* 86e2e8fd BACKPORT: media: Add BGR48_12 video format
* 89229327 UPSTREAM: media: Add YUV48_12 video format
* b2cf7e42 UPSTREAM: media: Add Y212 v4l2 format info
* 0f3f7a21 UPSTREAM: media: Add Y210, Y212 and Y216 formats
* ca7b45b1 UPSTREAM: media: Add Y012 video format
* 343b85ec UPSTREAM: media: Add P012 and P012M video format
* 7beed73a ANDROID: GKI: Create symbol files in include/config
* 295e779e ANDROID: fuse-bpf: Use stored bpf for create_open
* 74d9daa5 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* 6aef06ab ANDROID: fuse-bpf: Check inode not null
* 4bbda90b ANDROID: fuse-bpf: Fix flock test compile error
* 84ac22a0 ANDROID: fuse-bpf: Add partial ioctl support
* e341d231 ANDROID: ABI: Update oplus symbol list
* f5c707dc UPSTREAM: mm/mempolicy: Take VMA lock before replacing policy
* 890b1aab BACKPORT: mm: lock_vma_under_rcu() must check vma->anon_vma under vma lock
* d3b37a71 BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627
* a89e2cbb ANDROID: GKI: update xiaomi symbol list
* 371f8d90 UPSTREAM: mm: lock newly mapped VMA with corrected ordering
* 0d996040 UPSTREAM: fork: lock VMAs of the parent process when forking
* e3601b25 UPSTREAM: mm: lock newly mapped VMA which can be modified after it becomes visible
* 05f7c7fe UPSTREAM: mm: lock a vma before stack expansion
* c0ba567a ANDROID: GKI: bring back find_extend_vma()
* 188ce957 BACKPORT: mm: always expand the stack with the mmap write lock held
* 74efdc09 BACKPORT: execve: expand new process stack manually ahead of time
* c8ad9068 ANDROID: abi_gki_aarch64_qcom: ufshcd_mcq_poll_cqe_lock
* 1afccd42 UPSTREAM: mm: make find_extend_vma() fail if write lock not held
* 4087cac5 UPSTREAM: powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma()
* 6c332468 UPSTREAM: mm/fault: convert remaining simple cases to lock_mm_and_find_vma()
* add0a1ea UPSTREAM: arm/mm: Convert to using lock_mm_and_find_vma()
* 9f136450 UPSTREAM: riscv/mm: Convert to using lock_mm_and_find_vma()
* 053053fc UPSTREAM: mips/mm: Convert to using lock_mm_and_find_vma()
* 9cdce804 UPSTREAM: powerpc/mm: Convert to using lock_mm_and_find_vma()
* 1016faf5 BACKPORT: arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()
* 89298b8b BACKPORT: arm64/mm: Convert to using lock_mm_and_find_vma()
* cf70cb4f UPSTREAM: mm: make the page fault mmap locking killable
* 544ae28c ANDROID: Inherit "user-aware property" across rtmutex.
* 5e4a5dc8 BACKPORT: blk-crypto: use dynamic lock class for blk_crypto_profile::lock
* db2c29e5 ANDROID: ABI: update symbol list for Xclipse GPU
* 7edb035c ANDROID: drm/ttm: export ttm_tt_unpopulate()
* b61f298c ANDROID: GKI: Add ABI symbol list(devlink) for MTK
* ec419af2 ANDROID: devlink: Select CONFIG_NET_DEVLINK in Kconfig.gki
* 1e114e6e ANDROID: KVM: arm64: Fix memory ordering for pKVM module callbacks
* 3803ae4a BACKPORT: mm: introduce new 'lock_mm_and_find_vma()' page fault helper
* 66b5ad35 BACKPORT: maple_tree: fix potential out-of-bounds access in mas_wr_end_piv()
* 19dd4101 UPSTREAM: x86/smp: Cure kexec() vs. mwait_play_dead() breakage
* 26260c4b UPSTREAM: x86/smp: Use dedicated cache-line for mwait_play_dead()
* d8cb0365 UPSTREAM: x86/smp: Remove pointless wmb()s from native_stop_other_cpus()
* 6744547e UPSTREAM: x86/smp: Dont access non-existing CPUID leaf
* ba2ccba8 UPSTREAM: x86/smp: Make stop_other_cpus() more robust
* 5c9836e6 UPSTREAM: x86/microcode/AMD: Load late on both threads too
* 53048f15 BACKPORT: mm, hwpoison: when copy-on-write hits poison, take page offline
* a2dff37b UPSTREAM: mm, hwpoison: try to recover from copy-on write faults
* 466448f5 BACKPORT: mm/mmap: Fix error return in do_vmi_align_munmap()
* 41b30362 BACKPORT: mm/mmap: Fix error path in do_vmi_align_munmap()
* d45a054f UPSTREAM: HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
* 0e477a82 UPSTREAM: HID: hidraw: fix data race on device refcount
* af2d741b UPSTREAM: can: isotp: isotp_sendmsg(): fix return error fix on TX path
* 58870404 UPSTREAM: fbdev: fix potential OOB read in fast_imageblit()
* 6c48edb9 ANDROID: GKI: add function symbols for unisoc
* 342aff08 ANDROID: cgroup: Cleanup android_rvh_cgroup_force_kthread_migration
* fcdea346 UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* f091cc74 UPSTREAM: netfilter: nf_tables: fix chain binding transaction logic
* 1bb5e7fb ANDROID: abi_gki_aarch64_qcom: update abi

Change-Id: I6f86301f218a60c00d03e09a4e3bfebe42bad0d5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>