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

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



Catch the android14-5.15-lts branch up with recent changes made in the
android14-5.15 branch.  Included in here are the following commits:

* b94e9798 Merge tag 'android14-5.15.158_r00' into android14-5.15
* 44065585 ANDROID: 16K: Don't set padding vm_flags on 32-bit archs
* 82fe764b ANDROID: GKI: update mtktv symbol
* 7a6924d9 BACKPORT: arm64/ptrace: Don't enable SVE when setting streaming SVE
* 0bf1ffd8 UPSTREAM: cpuidle: teo: Update idle duration estimate when choosing shallower state
* 08d0ac35 UPSTREAM: arm64/fpsimd: Clear SME state in the target task when setting the VL
* 5a2e737d UPSTREAM: Documentation: arm64: Correct SME ZA macros name
* b308929e UPSTREAM: arm64/ptrace: Clean up error handling path in sve_set_common()
* 82108b57 UPSTREAM: arm64/fpsimd: Ensure SME storage is allocated after SVE VL changes
* 8afe474a UPSTREAM: arm64: sme: Use STR P to clear FFR context field in streaming SVE mode
* 9f621c32 UPSTREAM: wifi: cfg80211: fix regulatory disconnect for non-MLO
* 4092936f BACKPORT: scsi: ufs: Declare ufshcd_{hold,release}() once
* 1cdccfef UPSTREAM: KVM: arm64: vgic: Fix locking comment
* 85f8c81e UPSTREAM: wifi: nl80211: fix puncturing bitmap policy
* aed47dda BACKPORT: kernfs: fix potential NULL dereference in __kernfs_remove
* b8494a04 ANDROID: GKI: Update symbol list for Amlogic
* 95f5764e ANDROID: userfaultfd: Fix use-after-free in userfaultfd_using_sigbus()
* 61fba07b ANDROID: GKI: Update RTK STB KMI symbol list
* 2447b4c0 Merge tag 'android14-5.15.153_r00' into 'android14-5.15'
* 1e7959f6 ANDROID: fix kernelci GCC builds of fips140.ko
* 76b5a292 FROMLIST: locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
* 9572c01c ANDROID: fips140: remove unnecessary no_sanitize(cfi)
* 51cc4ca4 ANDROID: Update the ABI symbol list
* 6584213d ANDROID: GKI: Update symbol list for Amlogic
* bff9ae65 ANDROID: GKI: Update symbol list for Amlogic
* ce340041 ANDROID: mm: allow hooks into free_pages_prepare()
* 07782903 ANDROID: GKI: Update symbol list for Amlogic
* a1a623f6 ANDROID: vendor_hooks: Add hooks in migrate_page
* 770d4919 ANDROID: GKI: Update symbol list for Amlogic
* 685a016c UPSTREAM: af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
* 5c86c33a UPSTREAM: af_unix: Don't peek OOB data without MSG_OOB.
* 3169d364 UPSTREAM: af_unix: Clear stale u->oob_skb.
* 96ed674e Revert "f2fs: fix to tag gcing flag on page during block migration"
* e7eba5a1 ANDROID: Delete obsolete 16k_gki.fragment.
* 1491b902 BACKPORT: f2fs: clear writeback when compression failed
* 2f956cbb ANDROID: 16K: Only check basename of linker context
* d6164e38 ANDROID: arm64: vdso32: support user-supplied flags
* 7869fec7 UPSTREAM: mmc: core: Avoid negative index with array access
* 417f08df UPSTREAM: mmc: core: Initialize mmc_blk_ioc_data
* d86f55a3 ANDROID: Pixel: Add missing symbol to symbol list
* 699d8774 ANDROID: GKI: update mtktv symbol
* 7f18f2a3 ANDROID: set rewrite_absolute_paths_in_config for GKI aarch64.
* 0f96f3a5 BACKPORT: USB: gadget: core: create sysfs link between udc and gadget
* eef06c54 ANDROID: Add __nocfi return for swsusp_arch_resume
* 9a84d60e ANDROID: ABI fixup for abi break in struct dst_ops
* 9b0dadc8 BACKPORT: net: fix __dst_negative_advice() race

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