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

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:

abb897fe2f8e Merge branch 'android14-6.1' into 'android14-6.1-lts'
a5e46b0f UPSTREAM: io_uring/poll: serialize poll linked timer start with poll removal
6c695fad ANDROID: fuse-bpf: Add partial flock support
9b655e93 ANDROID: Incremental fs: Allocate data buffer based on input request size
facf08fa UPSTREAM: gfs2: Don't deref jdesc in evict
a16d62a2 ANDROID: KVM: arm64: Fix MMU context save/restore over TLB invalidation
7f0f58f9 ANDROID: Update symbol list for VIVO
1b7f1102 ANDROID: add initial symbol list file for ExynosAuto SoCs
f6707f35 ANDROID: sched: Export sched_domains_mutex for lockdep
a24911ab ANDROID: Update symbol for Exynos SoC
5e742110 ANDROID: ABI: Update symbol for Exynos SoC
270ca058 ANDROID: Update symbol list for mtk
47e02fe1 UPSTREAM: dma-remap: use kvmalloc_array/kvfree for larger dma memory remap
22e008d6 ANDROID: vendor_hooks: Supplement the missing hook call point.
214e6f26 ANDROID: GKI: Add WWAN as GKI protected module
8726a2d9 ANDROID: GKI: regmap: Add regmap vendor hook for of_syscon_register
7c2b6c7b UPSTREAM: kasan: suppress recursive reports for HW_TAGS
c0226bf0 UPSTREAM: kasan, arm64: add arch_suppress_tag_checks_start/stop
da926e60 UPSTREAM: arm64: mte: rename TCO routines
553be6e7 BACKPORT: kasan, arm64: rename tagging-related routines
b39a3be5 UPSTREAM: kasan: drop empty tagging-related defines
44ee9eef ANDROID: usb: xhci-plat: Fix double-free in xhci_plat_remove
55679fd0 ANDROID: ABI: update symbol list for galaxy
30807beb ANDROID: GKI: update the ABI symbol list
f3c6324d ANDROID: ABI: Update symbol for Exynos SoC
c75c8311 ANDROID: GKI: ABI: update whitelist for the kmsg_dump and native_hang symbols used by unisoc for kernel6.1
0a2e9dd6 ANDROID: ABI: Update symbols to unisoc whitelist for ims_bridge module
fc9c1ccb ANDROID: abi_gki_aarch64_qcom: Add drm_plane_from_index and drm_gem_prime_export
c480e4e5 ANDROID: abi_gki_aarch64_qcom: Update symbol list
8ecaef4d UPSTREAM: fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds
d5feaf81 UPSTREAM: fsverity: explicitly check for buffer overflow in build_merkle_tree()
711f5d5b ANDROID: update unisoc symbol list
dde9b179 ANDROID: update symbol for unisoc whitelist
dfd6ca25 UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
a3d87014 ANDROID: GKI: update xiaomi symbol list
dfc69fd8 Revert "FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue"
2e2b1f49 ANDROID: ABI: Update pixel symbol list
b57cdabd ANDROID: Set arch attribute for allmodconfig builds
f63b2625 UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
dc8c661b ANDROID: ABI: Add to QCOM symbols list
dd451f19 UPSTREAM: arm64: mm: pass original fault address to handle_mm_fault() in PER_VMA_LOCK block
39385f75 UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
35a9539d ANDROID: GKI: Update symbol list for MediatTek
fcbb015e UPSTREAM: scsi: ufs: core: Remove dedicated hwq for dev command
2eb41587 BACKPORT: scsi: ufs: mcq: Fix the incorrect OCS value for the device command
dc64f5f4 FROMLIST: scsi: ufs: ufs-mediatek: Add MCQ support for MTK platform
8740a92b FROMLIST: scsi: ufs: core: Export symbols for MTK driver module
c9814a3a UPSTREAM: blk-mq: check on cpu id when there is only one ctx mapping
c413cf73 UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
e84e043a UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
d2dfb4ee UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
3c60e58d UPSTREAM: iommu/amd: Add missing domain type checks
820f96cb UPSTREAM: tty: serial: qcom_geni: avoid duplicate struct member init
cbea99e1 UPSTREAM: scsi: ufs: core: bsg: Fix cast to restricted __be16 warning
c7798367 UPSTREAM: netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
ed2a2285 ANDROID: fix build error when use cpu_cgroup_online vh
8cd2dc49 ANDROID: ABI: add android_debug_symbol to whitelist
1047d4a5 ANDROID: defconfig: Enable debug_symbol driver
dfabd2e3 ANDROID: android: Create debug_symbols driver
f54778f0 ANDROID: ABI: update symbol list for exynos
58004e1d ANDROID: KVM: arm64: Remove 'struct kvm_vcpu' from the KMI
8a717a85 UPSTREAM: KVM: arm64: Restore GICv2-on-GICv3 functionality
b9d7d47d UPSTREAM: KVM: arm64: vgic: Wrap vgic_its_create() with config_lock
486a8ab3 UPSTREAM: KVM: arm64: vgic: Fix a circular locking issue
b5e26cd1 UPSTREAM: KVM: arm64: vgic: Don't acquire its_lock before config_lock
b1bb8a0b BACKPORT: KVM: arm64: Avoid lock inversion when setting the VM register width
b39849bd UPSTREAM: KVM: arm64: Avoid vcpu->mutex v. kvm->lock inversion in CPU_ON
04b12278 BACKPORT: KVM: arm64: Use config_lock to protect data ordered against KVM_RUN
de6bb81c UPSTREAM: KVM: arm64: Use config_lock to protect vgic state
cf0e6c7e BACKPORT: KVM: arm64: Add helper vgic_write_guest_lock()
4bbcece8 ANDROID: sound: usb: Fix wrong behavior of vendor hooking
55f14668 ANDROID: GKI: USB: XHCI: add Android ABI padding to struct xhci_vendor_ops
e27c6490 Revert "ANDROID: android: Create debug_symbols driver"
bb732365 ANDROID: android: Create debug_symbols driver
80ac9236 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
9a9c8764 ANDROID: update symbol list for unisoc vendor hook
e3a72785 ANDROID: thermal: Add hook to enable/disable thermal power throttle
05ba0cb8 ANDROID: ABI: Update symbol for Exynos SoC
251aa28d BACKPORT: FROMGIT: usb: gadget: udc: Handle gadget_connect failure during bind operation
5af50060 FROMGIT: usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens
79b7e0db ANDROID: GKI: Update symbol list for xiaomi
ff849674 ANDROID: vendor_hooks: vendor hook for MM
43d7226c ANDROID: add a symbol to unisoc symbol list
51cb1e1c ANDROID: GKI: update symbol list file for xiaomi
1499ddcb UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
054ab3ab ANDROID: db845c: Fix build when using --kgdb
a39af621 FROMGIT: usb: host: xhci-plat: Set XHCI_STATE_REMOVING before resuming XHCI HC
50c99c83 FROMGIT: usb: host: xhci: Do not re-initialize the XHCI HC if being removed
fa964568 FROMLIST: kheaders: dereferences the source tree
21061b7d FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue
ec0fc55a ANDROID: db845c: Local define for db845c targets
947e7c1d ANDROID: GKI: Update symbols to symbol list
9afd7b26 ANDROID: Export memcg functions to allow module to add new files
32c2d42e ANDROID: rockpi4: Fix build when using --kgdb
275048c8 ANDROID: GKI: update symbol list file for xiaomi
64e4b4d3 ANDROID: kleaf: android/gki_system_dlkm_modules is generated.
734b06da ANDROID: ABI: Update pixel symbol list
9ea87136 ANDROID: fuse-bpf: Move FUSE_RELEASE to correct place
b8ef5bfb ANDROID: fuse-bpf: Ensure bpf field can never be nulled
a97d54b5 ANDROID: GKI: Increase CMA areas to 32
d28f02c4 ANDROID: Delete MODULES_LIST from build configs.
97a56a07 ANDROID: ABI: Update symbols to unisoc whitelist
7668cef2 ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
1c4d2aa0 UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
8aea35f1 UPSTREAM: xfs: verify buffer contents when we skip log replay
04b6079e UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
8f5a2209 FROMLIST: maple_tree: Adjust node allocation on mas_rebalance()
e835ffdf FROMLIST: maple_tree: Reduce resets during store setup
70823448 FROMLIST: BACKPORT: maple_tree: Refine mas_preallocate() node calculations
d766c839 Revert "FROMLIST: BACKPORT: maple_tree: Refine mas_preallocate() node calculations"

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