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

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



This catches the android14-6.1-lts branch up with many abi updates and
other changes that have been merged into the android14-6.1 branch
recently.  Included in here are the following commits:

* 96d66062 ANDROID: GKI: Add initialization for mutex oem_data.
* 9e55f416 ANDROID: abi_gki_aarch64_qcom: whitelist some mm symbols
* 56526cf9 ANDROID: mm: swap: export and whitelist get_shadow_from_swap_cache
* 74be75dd ANDROID: mm: madvise: vendor hook to tune page flags
* 7fc37949 ANDROID: GKI: Add initialization for rwsem's oem_data and vendor_data.
* f6b99539 UPSTREAM: usb: dwc3: core: Skip setting event buffers for host only controllers
* ce6f9cab ANDROID: GKI: Update symbol list for mtk
* 256660fe ANDROID: GKI: Add symbol to symbol list for vivo.
* d256bfaf ANDROID: vendor_hooks: add hooks in prctl_set_vma
* 04685279 ANDROID: GKI: Update symbols list for vivo
* 81e9f061 UPSTREAM: arm64: mm: Make hibernation aware of KFENCE
* aa8621e0 ANDROID: Update the ABI symbol list: set_normalized_timespec64
* 87fb1f2f Merge tag 'android14-6.1.84_r00' into android14-6.1
* 76d91af9 ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
* c2dad376 ANDROID: fix kernelci GCC builds of fips140.ko
* 8bffcfee UPSTREAM: sched/fair: Use all little CPUs for CPU-bound workloads
* a1926c3f ANDROID: GKI: Extend Tuxera symbol list
* 6aaa06c1 FROMLIST: locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
* 7682e638 ANDROID: fips140: remove unnecessary no_sanitize(cfi)
* 681c9150 ANDROID: GKI: Add symbol to symbol list for vivo.
* 88b8a0c1 ANDROID: vendor_hooks: add hooks to modify pageflags
* 85a0c4be ANDROID: GKI: Add pageflags for OEM
* 724b50f1 ANDROID: GKI: Update symbol list for vivo
* a5329424 ANDROID: GKI: export sys_exit tracepoint
* 61665062 ANDROID: gki_defconfig: enable CONFIG_SYN_COOKIES
* 74a3c59c ANDROID: GKI: Update symbol list for vivo
* 1df05952 ANDROID: vendor_hooks: add hooks in rwsem
* 5747d79a ANDROID: Update the ABI symbol list
* a7daeb4d ANDROID: GKI: Update symbol list for vivo
* 2870c785 ANDROID: GKI: add percpu_rwsem vendor hooks
* 49203a28 FROMGIT: erofs: fix possible memory leak in z_erofs_gbuf_exit()
* 0013c554 BACKPORT: erofs: add a reserved buffer pool for lz4 decompression
* a35a9063 BACKPORT: erofs: do not use pagepool in z_erofs_gbuf_growsize()
* 2a23d59f BACKPORT: erofs: rename per-CPU buffers to global buffer pool and make it configurable
* bb687ee6 BACKPORT: erofs: rename utils.c to zutil.c
* bab4765e BACKPORT: erofs: relaxed temporary buffers allocation on readahead
* a3fb83b3 BACKPORT: erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off
* 91f4830f ANDROID: GKI: Update rockchip symbols for bcmdhd sdio wifi.
* a8b3ebe7 ANDROID: 16K: Avoid mmap lock assertions for padding VMAs
* caa8ffe4 BACKPORT: scsi: ufs: core: Fix handling of lrbp->cmd
* d682bd3b ANDROID: GKI: Update symbol list for xiaomi
* e2707736 ANDROID: vendor_hooks: add hooks in rwsem read trylock
* 1a72e2f6 ANDROID: GKI: update symbol list file for xiaomi
* cd89d4fa ANDROID: GKI: Update symbol list for vivo
* 40f3c9d6 ANDROID: vendor_hooks: add vendor hooks for fuse request
* f9840ee5 ANDROID: Update the ABI symbol list
* 12709c5c ANDROID: GKI: add symbol list for meizu
* bda57805 UPSTREAM: objtool: Fix HOSTCC flag usage
* b5164fdc UPSTREAM: objtool: Properly support make V=1
* fd5c2e13 UPSTREAM: objtool: Install libsubcmd in build
* de6fb073 UPSTREAM: af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
* 0e9ee922 UPSTREAM: af_unix: Don't peek OOB data without MSG_OOB.
* 30d168eb UPSTREAM: af_unix: Clear stale u->oob_skb.
* c0618d18 Revert "f2fs: fix to tag gcing flag on page during block migration"
* 25216be1 ANDROID: Delete obsolete 16k_gki.fragment.
* 4c45e2f3 UPSTREAM: f2fs: clear writeback when compression failed
* 7c734ede ANDROID: GKI: Add symbol list for exynosauto
* b22d7c4c FROMGIT: arm64: mte: Make mte_check_tfsr_*() conditional on KASAN instead of MTE
* 1331956f ANDROID: gki_defconfig: Disable CONFIG_BRCMSTB_DPFE and CONFIG_BRCMSTB_MEMC
* 002be199 FROMGIT: f2fs: fix to avoid use SSR allocate when do defragment
* dda68b16 ANDROID: 16K: Only check basename of linker context
* 65aed0e2 ANDROID: 16K: Avoid and document padding madvise lock warning
* ec795e4e ANDROID: arm64: vdso32: support user-supplied flags
* ac970648 ANDROID: GKI: Add initial symbol list for bcmstb
* b164ce27 ANDROID: gki_defconfig: Enable Broadcom STB SoCs
* d385f8f2 UPSTREAM: mmc: core: Do not force a retune before RPMB switch
* 5c4b00b7 UPSTREAM: arm64/arm: arm_pmuv3: perf: Don't truncate 64-bit registers
* ad62d386 BACKPORT: net: phy: Allow drivers to always call into ->suspend()
* 7c09ddbf UPSTREAM: ARM: perf: Mark all accessor functions inline
* f5e0452e UPSTREAM: arm64: perf: Mark all accessor functions inline
* 6d7eea37 UPSTREAM: perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype
* bf3022d3 UPSTREAM: ARM: perf: Allow the use of the PMUv3 driver on 32bit ARM
* 393be9f6 UPSTREAM: ARM: Make CONFIG_CPU_V7 valid for 32bit ARMv8 implementations
* 9d0a91c9 UPSTREAM: perf: pmuv3: Change GENMASK to GENMASK_ULL
* ab26945f UPSTREAM: perf: pmuv3: Move inclusion of kvm_host.h to the arch-specific helper
* 3e7e6fa4 UPSTREAM: perf: pmuv3: Abstract PMU version checks
* 55cfecda UPSTREAM: arm64: perf: Abstract system register accesses away
* 278e973f UPSTREAM: arm64: perf: Move PMUv3 driver to drivers/perf
* 222a79a1 UPSTREAM: arm64/perf: Replace PMU version number '0' with ID_AA64DFR0_EL1_PMUVer_NI
* 62a4d78d ANDROID: GKI: Update oplus symbol list
* bfacfd19 UPSTREAM: block/blk-mq: Don't complete locally if capacities are different
* cf4893eb BACKPORT: sched: Add a new function to compare if two cpus have the same capacity
* e4622d46 ANDROID: GKI: Update rockchip symbols for rndis_host.
* f601b06a ANDROID: GKI: Update rockchip symbols for snd multi dais.
* 986fffb5 UPSTREAM: usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
* 163070bc UPSTREAM: usb: gadget: f_fs: use io_data->status consistently
* 3c19f701 ANDROID: set rewrite_absolute_paths_in_config for GKI aarch64.
* 9fcc2459 UPSTREAM: wifi: cfg80211: Clear mlo_links info when STA disconnects
* e2c5ee3d ANDROID: ABI: Add usb_gadget_connect & usb_gadget_disconnect symbol
* c5abb617 ANDROID: GKI: Update symbol list for mtk
* c36abc6d BACKPORT: iommu: Have __iommu_probe_device() check for already probed devices
* a7462d70 ANDROID: ABI fixup for abi break in struct dst_ops
* bd2bcb81 BACKPORT: net: fix __dst_negative_advice() race
* 997e6b3f Revert "crypto: api - Disallow identical driver names"

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