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

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



This syncs up the android14-6.1-lts branch with many changes that have
happened in the android14-6.1 branch.

Included in here are the following commits:

d2c0f4c4 FROMLIST: devcoredump: Send uevent once devcd is ready
95307ec5 FROMLIST: iommu: Avoid more races around device probe
5c8e5939 ANDROID: Update the ABI symbol list
94ddfc9c FROMLIST: ufs: core: clear cmd if abort success in mcq mode
8f46c349 BACKPORT: wifi: cfg80211: Allow AP/P2PGO to indicate port authorization to peer STA/P2PClient
b3ccd8f0 BACKPORT: wifi: cfg80211: OWE DH IE handling offload
daa7a3d9 ANDROID: KVM: arm64: mount procfs for pKVM module loading
1b639e97 ANDROID: GKI: Update symbol list for mtk
b496cc31 ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
8431e524 UPSTREAM: serial: 8250_port: Check IRQ data before use
825c1742 ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort()
22e91664 ANDROID: abi_gki_aarch64_qcom: Update symbol list
ca06bb1e ANDROID: GKI: add allowed list for Exynosauto SoC
fb917175 ANDROID: Update the ABI symbol list
ec3c9a17 ANDROID: sched: Add vendor hook for util_fits_cpu
c47043d6 ANDROID: update symbol for unisoc vendor_hooks
6e881bf0 ANDROID: vendor_hooks: mm: add hook to count the number pages allocated for each slab
a59b3286 UPSTREAM: usb: gadget: udc: Handle gadget_connect failure during bind operation
7a33209b ANDROID: Update the ABI symbol list
69b68997 ANDROID: softirq: Add EXPORT_SYMBOL_GPL for softirq and tasklet
48c6c901 ANDROID: fs/passthrough: Fix compatibility with R/O file system
abcd4c51 FROMLIST: usb: typec: tcpm: Fix sink caps op current check
9d6ac9dc UPSTREAM: scsi: ufs: core: Add advanced RPMB support where UFSHCI 4.0 does not support EHS length in UTRD
beea0953 ANDROID: ABI: Update symbol list for MediatTek
5683c2b4 ANDROID: vendor_hooks: Add hook for mmc queue
43a07d84 Revert "proc: allow pid_revalidate() during LOOKUP_RCU"
230d34da UPSTREAM: scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
0920d4de ANDROID: GKI: Update symbols to symbol list
019393a9 ANDROID: vendor_hook: Add hook to tune readaround size
0c859c21 ANDROID: add for tuning readahead size
a8206e30 ANDROID: vendor_hooks: Add hooks to avoid key threads stalled in memory allocations
ad9947dc ANDROID: GKI: Update oplus symbol list
71f3b61e ANDROID: vendor_hooks: add hooks for adjust kvmalloc_node alloc_flags
fef66e85 UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
7bec8a81 ANDROID: ABI: Update symbol list for imx
af888bd2 ANDROID: abi_gki_aarch64_qcom: Add __netif_rx
131de563 ANDROID: ABI: Update sony symbol list and stg
977770ec ANDROID: mmc: Add vendor hooks for sdcard failure diagnostics
f8d3b450 ANDROID: Update symbol list for mtk
2799026a UPSTREAM: scsi: ufs: mcq: Fix the search/wrap around logic
7350783e UPSTREAM: scsi: ufs: core: Fix ufshcd_inc_sq_tail() function bug
ff5fa0b7 FROMLIST: ufs: core: Expand MCQ queue slot to DeviceQueueDepth + 1
4bbeaddf Revert "ANDROID: KVM: arm64: Don't allocate from handle_host_mem_abort"
9d38c0bc BACKPORT: usb: typec: altmodes/displayport: Signal hpd when configuring pin assignment
e329419f UPSTREAM: mm: multi-gen LRU: don't spin during memcg release
3d1b5829 UPSTREAM: vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()

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