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

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



This catches the android14-5.15-lts branch up with a lot of abi updates
and other changes.  Commits merged here are the following:

* 3547af4e ANDROID: gki_config: Disable CONFIG_DEBUG_STACK_USAGE
* 97a91b21 ANDROID: GKI: Add symbol list for SYNA
* 8891bf24 ANDROID: GKI: Update symbol list for Amlogic
* 570d8e0c ANDROID: binder: fix KMI issues due to frozen notification
* da8a5609 BACKPORT: FROMGIT: binder: frozen notification binder_features flag
* eaf6c205 BACKPORT: FROMGIT: binder: frozen notification
* c61fe008 ANDROID: KVM: arm64: Fix cpu type for tracing HVCs
* 26850529 ANDROID: GKI: Update symbol list for Amlogic
* cf8dbefa ANDROID: GKI: update hisense symbol
* 1fabbd89 UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()
* 6317f88f Merge tag 'android14-5.15.164_r00' into android14-5.15
* 30efc10d FROMLIST: binder: fix UAF caused by offsets overwrite
* c8c7a448 ANDROID: fix wrong merge resolution
* e5a19786 ANDROID: tools/objtool: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* 277b9914 ANDROID: GKI: Update symbols to symbol list
* 84730123 ANDROID: Add Interrupt Hook for madvise Compression
* b0feff24 ANDROID: GKI: update mtktv symbol
* 5537a38d UPSTREAM: lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
* 76c0166f UPSTREAM: lib/build_OID_registry: don't mention the full path of the script in output
* ea87c651 ANDROID: GKI: Update symbol list for Amlogic
* 34434a3c UPSTREAM: scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
* a47d2019 UPSTREAM: KVM: arm64: Fix host-programmed guest events in nVHE
* 34af4466 UPSTREAM: arm64/sme: Restore SME registers on exit from suspend
* 60406d4b UPSTREAM: usb: core: Prevent null pointer dereference in update_port_device_state
* a059170f UPSTREAM: mm/damon/vaddr: change asm-generic/mman-common.h to linux/mman.h
* c4ac5e15 UPSTREAM: KVM: x86: Get CPL directly when checking if loaded vCPU is in kernel mode
* d6129466 UPSTREAM: usb: typec: tcpm: Add additional checks for contaminant
* bd5b2ae0 BACKPORT: crypto: xts - use 'spawn' for underlying single-block cipher
* 0db7559e UPSTREAM: kasan: use unchecked __memset internally
* e3193a8a UPSTREAM: scsi: ufs: core: Correct clear TM error log
* c10e81a9 UPSTREAM: mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
* 2556efd9 UPSTREAM: firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND
* 8a08907d UPSTREAM: wifi: cfg80211: remove dead/unused enum value
* 8ba7000e UPSTREAM: wifi: nl80211: fix integer overflow in nl80211_parse_mbssid_elems()
* 12733f7f UPSTREAM: arm64/fpsimd: Sync and zero pad FPSIMD state for streaming SVE
* cc764291 UPSTREAM: arm64/fpsimd: Sync FPSIMD state with SVE for SME only systems
* aad9899a ANDROID: fuse: Skip canonical path logic if ENOSYS
* e7db516e ANDROID: fsnotify: Do not notify lower fs of open when ENOSYS
* d30ecb16 ANDROID: GKI: update mtktv symbol
* 4605e09b ANDROID: GKI: remove export of tracing control functions
* ec517cca UPSTREAM: exfat: fix overflow for large capacity partition
* 831bc58c BACKPORT: exfat: reduce block requests when zeroing a cluster
* f122a786 ANDROID: fix kernelci build-break for !CONFIG_ANDROID_VENDOR_OEM_DATA
* bdd669e2 ANDROID: Incremental fs: Retry page faults on non-fatal errors
* 0a1237eb ANDROID: GKI: update mtktv symbol
* 4e570c14 ANDROID: abi_gki_aarch64_qcom: Add hibernation APIs
* 8240182a ANDROID: vendor hooks: Encrypt snapshot for bootloader based hibernation
* 96af47eb ANDROID: abi_gki_aarch64_qcom: Add secure hibernation APIs
* cbd029a7 ANDROID: Export symbols for bootloader based hibernation
* 15da2780 UPSTREAM: tty: serial: qcom-geni-serial: Add support for Hibernation feature
* 7fec6d61 ANDROID: vendor hooks: Add hooks to support bootloader based hibernation
* 08518537 ANDROID: Enable HIBERNATION config in gki_defconfig
* d92fdb7d UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

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