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

Merge branch 'android13-5.15' into branch 'android13-5.15-lts'



This catches the android13-5.15-lts branch up with recent changes in
android13-5.15.  Included in here are the following commits:

* 4c213b2e ANDROID: GKI: Add initialization for mutex oem_data.
* 2b49e96b ANDROID: ABI: Update oplus symbol list
* 64b5a749 ANDROID: vendor_hooks: add hooks to move certain scenarios' work to a fixed binder thread
* 2e22559d ANDROID: userfaultfd: Fix use-after-free in userfaultfd_using_sigbus()
* 5c2e11cb ANDROID: GKI: Update symbol list for mtk
* 1a5cffcb ANDROID: GKI: Add initialization for rwsem's oem_data and vendor_data.
* 7105e95d ANDROID: update symbol for unisoc whitelist
* 18a82ede ANDROID: GKI: Update symbols list for vivo
* 74248851 FROMLIST: iommu: Avoid races around default domain allocations
* 116cf2ba BACKPORT: iommu: Have __iommu_probe_device() check for already probed devices
* 3469400d ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
* 1557636d ANDROID: ABI: Update symbols to unisoc whitelist for the K5.15
* 89e6e9b9 FROMLIST: locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
* 23db87e6 UPSTREAM: scsi: ufs: core: Perform read back after writing UTP_TASK_REQ_LIST_BASE_H
* 4b84eaca UPSTREAM: mm/damon/vaddr: change asm-generic/mman-common.h to linux/mman.h
* 71baffb3 UPSTREAM: crypto: xts - use 'spawn' for underlying single-block cipher
* 82cf9a6b UPSTREAM: mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
* 439dc7aa UPSTREAM: firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND
* af2941e8 UPSTREAM: wifi: cfg80211: remove dead/unused enum value
* c9b438b7 UPSTREAM: f2fs: avoid false alarm of circular locking
* cbf6193e UPSTREAM: wifi: nl80211: fix integer overflow in nl80211_parse_mbssid_elems()
* c41b86c8 UPSTREAM: wifi: cfg80211: fix regulatory disconnect for non-MLO
* 8068046b ANDROID: GKI: Update symbol list for vivo
* 17e52336 ANDROID: GKI: export sys_exit tracepoint
* 19fca165 ANDROID: GKI: Update symbol list for Amlogic
* 4b9d2968 ANDROID: mm: allow hooks into free_pages_prepare()
* 2dab3719 ANDROID: GKI: Update symbol list for vivo
* e428c242 ANDROID: vendor_hooks: add hooks in rwsem read trylock
* dde87296 UPSTREAM: netfilter: nf_conntrack_h323: Add protection for bmp length out of range
* 5b4450f3 ANDROID: GKI: Update symbol list for vivo
* b74701f8 ANDROID: GKI: add percpu_rwsem vendor hooks
* d397771f ANDROID: GKI: Update symbol list for vivo
* 869fc79d ANDROID: vendor_hooks: add hooks in rwsem
* db3398da ANDROID: GKI: Update symbol list for vivo
* e9fd05e6 ANDROID: vendor_hooks: add vendor hooks for fuse request
* 2a5e5545 UPSTREAM: af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
* 7b0e3c11 UPSTREAM: af_unix: Don't peek OOB data without MSG_OOB.
* 1000e310 UPSTREAM: af_unix: Clear stale u->oob_skb.
* 650bfd67 ANDROID: GKI: Update symbols to symbol list
* b471c8d8 Revert "f2fs: fix to tag gcing flag on page during block migration"
* ee7a9532 BACKPORT: f2fs: clear writeback when compression failed
* c101250b FROMGIT: f2fs: do not return EFSCORRUPTED, but try to run online repair
* 605ec802 BACKPORT: f2fs: support recording errors into superblock
* 642d1cc8 BACKPORT: f2fs: fix to detect corrupted meta ino
* 9270a3b1 ANDROID: 16K: Only check basename of linker context
* 70995ba6 UPSTREAM: mmc: core: Avoid negative index with array access
* fd8d3a66 UPSTREAM: mmc: core: Initialize mmc_blk_ioc_data
* 4c32142b ANDROID: GKI: Update oplus symbol list
* 98459563 BACKPORT: f2fs: fix to handle error paths of {new,change}_curseg()
* bffffc7b BACKPORT: f2fs: fix to check return value __allocate_new_segment
* 034ca7e0 BACKPORT: f2fs: fix to handle segment allocation failure correctly
* 25d1f594 BACKPORT: f2fs: stop checkpoint when get a out-of-bounds segment
* 5883e805 UPSTREAM: usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
* 30b4ff1c UPSTREAM: usb: gadget: f_fs: use io_data->status consistently
* abadd460 UPSTREAM: wifi: cfg80211: Clear mlo_links info when STA disconnects
* edecefee ANDROID: Add __nocfi return for swsusp_arch_resume
* bda79d62 ANDROID: ABI fixup for abi break in struct dst_ops
* b8932254 BACKPORT: net: fix __dst_negative_advice() race

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