Greg Kroah-Hartman 8b02e8901d 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: * 9fd41ac172 ANDROID: Delete build.config.gki.aarch64.16k. * 073df44c36 FROMGIT: usb: typec: tcpm: Refactor the PPS APDO selection * 078410e73f UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event * 722f6cc09c ANDROID: Revert "ANDROID: allmodconfig: disable WERROR" * c2611a04b9 ANDROID: GKI: update symbol list file for xiaomi * 34fde9ec08 FROMGIT: usb: typec: tcpm: not sink vbus if operational current is 0mA * 3ebafb7b46 BACKPORT: FROMGIT: mm: handle faults that merely update the accessed bit under the VMA lock * 9e066d4b35 FROMLIST: mm: Allow fault_dirty_shared_page() to be called under the VMA lock * 83ab986324 FROMGIT: mm: handle swap and NUMA PTE faults under the VMA lock * ffcebdef16 FROMGIT: mm: run the fault-around code under the VMA lock * 072c35fb69 FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check down from do_fault() * fa9a8adff0 FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check down in handle_pte_fault() * dd621869c1 BACKPORT: FROMGIT: mm: handle some PMD faults under the VMA lock * 8594d6a30f BACKPORT: FROMGIT: mm: handle PUD faults under the VMA lock * 66cbbe6b31 FROMGIT: mm: move FAULT_FLAG_VMA_LOCK check from handle_mm_fault() * e26044769f BACKPORT: FROMGIT: mm: allow per-VMA locks on file-backed VMAs * 4cb518a06f FROMGIT: mm: remove CONFIG_PER_VMA_LOCK ifdefs * f4b32b7f15 FROMGIT: mm: fix a lockdep issue in vma_assert_write_locked * 250f19771f FROMGIT: mm: handle userfaults under VMA lock * e704d0e4f9 FROMGIT: mm: handle swap page faults under per-VMA lock * f8a65b694b FROMGIT: mm: change folio_lock_or_retry to use vm_fault directly * 693d905ec0 BACKPORT: FROMGIT: mm: drop per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED * 939d4b1ccc BACKPORT: FROMGIT: mm: move vma locking out of vma_prepare and dup_anon_vma * 0f0b09c02c BACKPORT: FROMGIT: mm: always lock new vma before inserting into vma tree * a8a479ed96 FROMGIT: mm: lock vma explicitly before doing vm_flags_reset and vm_flags_reset_once * ad18923856 FROMGIT: mm: replace mmap with vma write lock assertions when operating on a vma * 5f0ca924aa FROMGIT: mm: for !CONFIG_PER_VMA_LOCK equate write lock assertion for vma and mmap * abb0f2767e FROMGIT: mm: don't drop VMA locks in mm_drop_all_locks() * 365af746f5 BACKPORT: riscv: mm: try VMA lock-based page fault handling first * 3c187b4a12 BACKPORT: FROMGIT: mm: enable page walking API to lock vmas during the walk * b6093c47fe BACKPORT: mm: lock VMA in dup_anon_vma() before setting ->anon_vma * 0ee0062c94 UPSTREAM: mm: fix memory ordering for mm_lock_seq and vm_lock_seq * 3378cbd264 FROMGIT: usb: host: ehci-sched: try to turn on io watchdog as long as periodic_count > 0 * 2d3351bd5e FROMGIT: BACKPORT: usb: ehci: add workaround for chipidea PORTSC.PEC bug * 7fa8861130 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux * 683966ac69 UPSTREAM: mm/mmap: Fix extra maple tree write * f86c79eb86 FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible * 7ae1e02abb UPSTREAM: mm: skip CMA pages when they are not available * 7666325265 UPSTREAM: dma-buf: fix an error pointer vs NULL bug * e61d76121f UPSTREAM: dma-buf: keep the signaling time of merged fences v3 * fda157ce15 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush * 110a26edd1 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue * 9db1437238 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters * 7688102949 UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal * 37f4509407 ANDROID: Add checkpatch target. * d7dacaa439 UPSTREAM: USB: Gadget: core: Help prevent panic during UVC unconfigure * 4dc009c3a8 ANDROID: GKI: Update symbols to symbol list * fadc35923d ANDROID: vendor_hook: fix the error record position of mutex * 3fc69d3f70 ANDROID: ABI: add allowed list for galaxy * a5a662187f ANDROID: gfp: add __GFP_CMA in gfpflag_names * b520b90913 ANDROID: ABI: Update to fix slab-out-of-bounds in xhci_vendor_get_ops * c2cbb3cc24 ANDROID: usb: host: fix slab-out-of-bounds in xhci_vendor_get_ops * 64787ee451 ANDROID: GKI: update pixel symbol list for xhci * b0c06048a8 FROMGIT: fs: drop_caches: draining pages before dropping caches * 2f76bb83b1 ANDROID: GKI: update symbol list file for xiaomi * 8e86825eec ANDROID: uid_sys_stats: Use a single work for deferred updates * 960d9828ee ANDROID: ABI: Update symbol for Exynos SoC * 3926cc6ef8 ANDROID: GKI: Add symbols to symbol list for vivo * dbb09068c1 ANDROID: vendor_hooks: Add tune scan type hook in get_scan_count() * 5e1d25ac2a FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around() * addf1a9a65 FROMGIT: Multi-gen LRU: Avoid race in inc_min_seq() * a7adb98897 FROMGIT: Multi-gen LRU: Fix per-zone reclaim * 03812b904e ANDROID: ABI: update symbol list for galaxy * b283f9b41f ANDROID: oplus: Update the ABI xml and symbol list * c3d26e2b5a ANDROID: vendor_hooks: Add hooks for lookaround * 29e2f3e3d1 ANDROID: ABI: Update STG ABI to format version 2 * 3bd3d13701 ANDROID: ABI: Update symbol list for imx * ad0b008167 FROMGIT: erofs: fix wrong primary bvec selection on deduplicated extents * 126ef64cba UPSTREAM: media: Add ABGR64_12 video format * 86e2e8fd05 BACKPORT: media: Add BGR48_12 video format * 892293272c UPSTREAM: media: Add YUV48_12 video format * b2cf7e4268 UPSTREAM: media: Add Y212 v4l2 format info * 0f3f7a21af UPSTREAM: media: Add Y210, Y212 and Y216 formats * ca7b45b128 UPSTREAM: media: Add Y012 video format * 343b85ecad UPSTREAM: media: Add P012 and P012M video format * 7beed73af0 ANDROID: GKI: Create symbol files in include/config * 295e779e8f ANDROID: fuse-bpf: Use stored bpf for create_open * 74d9daa59a ANDROID: fuse-bpf: Add bpf to negative fuse_dentry * 6aef06abba ANDROID: fuse-bpf: Check inode not null * 4bbda90bd8 ANDROID: fuse-bpf: Fix flock test compile error * 84ac22a0d3 ANDROID: fuse-bpf: Add partial ioctl support * e341d2312c ANDROID: ABI: Update oplus symbol list * f5c707dc65 UPSTREAM: mm/mempolicy: Take VMA lock before replacing policy * 890b1aabb1 BACKPORT: mm: lock_vma_under_rcu() must check vma->anon_vma under vma lock * d3b37a712a BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627 * a89e2cbbc0 ANDROID: GKI: update xiaomi symbol list * 371f8d901a UPSTREAM: mm: lock newly mapped VMA with corrected ordering * 0d9960403c UPSTREAM: fork: lock VMAs of the parent process when forking * e3601b25ae UPSTREAM: mm: lock newly mapped VMA which can be modified after it becomes visible * 05f7c7fe72 UPSTREAM: mm: lock a vma before stack expansion * c0ba567af1 ANDROID: GKI: bring back find_extend_vma() * 188ce9572f BACKPORT: mm: always expand the stack with the mmap write lock held * 74efdc0966 BACKPORT: execve: expand new process stack manually ahead of time * c8ad906849 ANDROID: abi_gki_aarch64_qcom: ufshcd_mcq_poll_cqe_lock * 1afccd4255 UPSTREAM: mm: make find_extend_vma() fail if write lock not held * 4087cac574 UPSTREAM: powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma() * 6c33246824 UPSTREAM: mm/fault: convert remaining simple cases to lock_mm_and_find_vma() * add0a1ea04 UPSTREAM: arm/mm: Convert to using lock_mm_and_find_vma() * 9f136450af UPSTREAM: riscv/mm: Convert to using lock_mm_and_find_vma() * 053053fc68 UPSTREAM: mips/mm: Convert to using lock_mm_and_find_vma() * 9cdce804c0 UPSTREAM: powerpc/mm: Convert to using lock_mm_and_find_vma() * 1016faf509 BACKPORT: arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault() * 89298b8b3c BACKPORT: arm64/mm: Convert to using lock_mm_and_find_vma() * cf70cb4f1f UPSTREAM: mm: make the page fault mmap locking killable * 544ae28cf6 ANDROID: Inherit "user-aware property" across rtmutex. * 5e4a5dc820 BACKPORT: blk-crypto: use dynamic lock class for blk_crypto_profile::lock * db2c29e53d ANDROID: ABI: update symbol list for Xclipse GPU * 7edb035c79 ANDROID: drm/ttm: export ttm_tt_unpopulate() * b61f298c0d ANDROID: GKI: Add ABI symbol list(devlink) for MTK * ec419af28f ANDROID: devlink: Select CONFIG_NET_DEVLINK in Kconfig.gki * 1e114e6efa ANDROID: KVM: arm64: Fix memory ordering for pKVM module callbacks * 3803ae4a28 BACKPORT: mm: introduce new 'lock_mm_and_find_vma()' page fault helper * 66b5ad3507 BACKPORT: maple_tree: fix potential out-of-bounds access in mas_wr_end_piv() * 19dd4101e0 UPSTREAM: x86/smp: Cure kexec() vs. mwait_play_dead() breakage * 26260c4bd1 UPSTREAM: x86/smp: Use dedicated cache-line for mwait_play_dead() * d8cb0365cb UPSTREAM: x86/smp: Remove pointless wmb()s from native_stop_other_cpus() * 6744547e95 UPSTREAM: x86/smp: Dont access non-existing CPUID leaf * ba2ccba863 UPSTREAM: x86/smp: Make stop_other_cpus() more robust * 5c9836e66d UPSTREAM: x86/microcode/AMD: Load late on both threads too * 53048f151c BACKPORT: mm, hwpoison: when copy-on-write hits poison, take page offline * a2dff37b0c UPSTREAM: mm, hwpoison: try to recover from copy-on write faults * 466448f55f BACKPORT: mm/mmap: Fix error return in do_vmi_align_munmap() * 41b30362e9 BACKPORT: mm/mmap: Fix error path in do_vmi_align_munmap() * d45a054f9c UPSTREAM: HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651. * 0e477a82e6 UPSTREAM: HID: hidraw: fix data race on device refcount * af2d741bf3 UPSTREAM: can: isotp: isotp_sendmsg(): fix return error fix on TX path * 5887040491 UPSTREAM: fbdev: fix potential OOB read in fast_imageblit() * 6c48edb9c9 ANDROID: GKI: add function symbols for unisoc * 342aff08ae ANDROID: cgroup: Cleanup android_rvh_cgroup_force_kthread_migration * fcdea346bb UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free * f091cc7434 UPSTREAM: netfilter: nf_tables: fix chain binding transaction logic * 1bb5e7fb37 ANDROID: abi_gki_aarch64_qcom: update abi Change-Id: I6f86301f218a60c00d03e09a4e3bfebe42bad0d5 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>		2023-08-23 18:31:43 +00:00
..
boot	nios2: dts: Fix tse_mac "max-frame-size" property	2023-06-21 16:00:54 +02:00
configs	treewide: defconfig: address renamed CONFIG_DEBUG_INFO=y	2022-09-11 21:55:05 -07:00
include	kernel: exit: cleanup release_thread()	2022-09-11 21:55:07 -07:00
kernel	kbuild: use obj-y instead extra-y for objects placed at the head	2022-10-02 18:04:05 +09:00
lib
mm	UPSTREAM: mm/fault: convert remaining simple cases to lock_mm_and_find_vma()	2023-07-27 05:04:57 +00:00
platform	nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST	2021-10-27 09:29:07 -05:00
Kbuild	nios2: move core-y in arch/nios2/Makefile to arch/nios2/Kbuild	2022-09-29 04:40:14 +09:00
Kconfig	UPSTREAM: mm/fault: convert remaining simple cases to lock_mm_and_find_vma()	2023-07-27 05:04:57 +00:00
Kconfig.debug	NIOS2: fix kconfig unmet dependency warning for SERIAL_CORE_CONSOLE	2021-09-24 08:49:39 -05:00
Makefile	kbuild: remove head-y syntax	2022-10-02 18:06:03 +09:00