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

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



This is the merge of the android13-5.15 branch to catch up with many
changes that have happened there.

It contains the following commits:

*   6e221c28 Merge "Merge tag 'android13-5.15.119_r00' into android13-5.15" into android13-5.15
|\
| * 76a6390c Merge tag 'android13-5.15.119_r00' into android13-5.15
* | 3a4b0ffd UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
* | 1bff58d8 ANDROID: abi_gki_aarch64_qcom: update abi
* | aa25f16d UPSTREAM: ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
* | 1fe4e6a1 UPSTREAM: ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close()
* | 553517df UPSTREAM: ASoC: soc-pcm: Move debugfs removal out of spinlock
* | 8930f00e ANDROID: GKI: Update the ABI for ASoC fixes
* | 012e5787 BACKPORT: ASoC: soc-pcm: fix BE handling of PAUSE_RELEASE
* | fc213aa3 BACKPORT: ASoC: soc-pcm: test refcount before triggering
* | cdaafbf2 UPSTREAM: ASoC: soc-pcm: serialize BE triggers
* | a64a5028 ANDROID: GKI: Update the ABI xml
* | bccc1a4b BACKPORT: ASoC: soc-pcm: Fix and cleanup DPCM locking
* | 957ddd43 ANDROID: ABI: Update pixel symbol list
* | fff5759c ANDROID: ABI: update gki symbol list
* | 79353327 ANDROID: Add vendor hook for cma adjusting
* | dbd50f61 UPSTREAM: squashfs: always build "file direct" version of page actor
* | 70b4d2ce UPSTREAM: squashfs: fix cache race with migration
* | b3247f73 BACKPORT: squashfs: cache partial compressed blocks
* | 51dde019 UPSTREAM: squashfs: fix buffer release race condition in readahead code
* | 9d967deb UPSTREAM: squashfs: fix extending readahead beyond end of file
* | c1941209 UPSTREAM: squashfs: fix read regression introduced in readahead code
* | d35f75a3 UPSTREAM: squashfs: don't call kmalloc in decompressors
* | 357f4067 UPSTREAM: squashfs: don't use intermediate buffer if pages missing
* | 2004e9c6 UPSTREAM: squashfs: extend "page actor" to handle missing pages
* | 83db775f UPSTREAM: squashfs: support reading fragments in readahead call
* | 85a9a0f6 UPSTREAM: squashfs: implement readahead
* | ae5b9259 FROMLIST: fuse: revalidate: don't invalidate if interrupted
* | 982656a6 UPSTREAM: gfs2: Don't deref jdesc in evict
* | 0050e63d ANDROID: ABI: Update symbols to unisoc whitelist
* | 8dd49c10 ANDROID: Incremental fs: Allocate data buffer based on input request size
* | c326542e ANDROID: GKI: Update symbol list for Amlogic
* | 7364bcf6 ANDROID: KVM: arm64: Fix MMU context save/restore over TLB invalidation
* | ab27b983 Revert "ANDROID: mm/slab: Create 64-byte slab caches if the hardware supports it"
* | 4b24277c UPSTREAM: wifi: cfg80211: fix link del callback to call correct handler
* | e4743dd0 UPSTREAM: wifi: cfg80211: reject bad AP MLD address
* | 05acbbe2 UPSTREAM: KVM: arm64: Populate fault info for watchpoint
* | 106014fc UPSTREAM: media: pvrusb2: fix DVB_CORE dependency
* | c91d54a4 BACKPORT: iommu/mediatek: Set dma_mask for PGTABLE_PA_35_EN
* | 2e5c9d75 UPSTREAM: Revert "kasan: drop skip_kasan_poison variable in free_pages_prepare"
* | 0bf333f6 UPSTREAM: wifi: cfg80211: fix MLO connection ownership
* | d809ff52 UPSTREAM: wifi: nl80211: fix NULL-ptr deref in offchan check
* | 53283278 ANDROID: vendor_hooks: Supplement the missing hook call point.
* | 7b71c156 ANDROID: GKI: add symbol list for Mediatek
* | 84d2796e ANDROID: devlink: Select NET_DEVLINK in Kconfig.gki
* | aa7bd5a8 ANDROID: GKI: Update symbols to symbol list
* | 024628cc ANDROID: vendor_hook: Add hook to abort reclaim and compaction
* | 9d47ecd0 ANDROID: add a new symbol to symbol list for unisoc
* | d75757f1 ANDROID: mm: Add a vendor hook for slab page alloced checking
|/
* 69229201 ANDROID: GKI: Update symbol list for sunxi
* 1f8c32b1 ANDROID: ABI: update gki symbol list
* a03eac4b ANDROID: add new vender hook to fix bug
* c2a56c48 UPSTREAM: tick/broadcast: Make broadcast device replacement work correctly
* 3e287481 UPSTREAM: usb: dwc3: gadget: Return -ESHUTDOWN on ep disable
* 70c18ca7 ANDROID: gki_config: enable CONFIG_RELAY
* 10a17dca BACKPORT: cgroup/cpuset: Free DL BW in case can_attach() fails
* 64668f1e BACKPORT: sched/deadline: Create DL BW alloc, free & check overflow interface
* bba2dd99 FROMGIT: cgroup/cpuset: Iterate only if DEADLINE tasks are present
* b62781fb BACKPORT: sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets
* 723ec5bf BACKPORT: sched/cpuset: Bring back cpuset_mutex
* 2acbd62d FROMGIT: cgroup/cpuset: Rename functions dealing with DEADLINE accounting
* 2c074c64 UPSTREAM: cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach()
* ae103a89 UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
* 25922309 UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 51ccf386 ANDROID: GKI: Update symbols to symbol list
* 862230c3 ANDROID: vendor_hook: Add hook to tune readaround size
* dd8ee9a8 ANDROID: add for tuning readahead size
* aa47cc7c ANDROID: vendor_hooks: Add hooks to avoid key threads stalled in memory allocations
* 5b704934 UPSTREAM: io_uring: hold uring mutex around poll removal
* 1cd4d4fe Revert "FROMLIST: [PATCH v2] tick/broadcast: Do not set oneshot_mask except was_periodic was true"
* ea6c1162 UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 492837d7 UPSTREAM: netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
* 2ed4bff7 ANDROID: GKI: Update symbol list for Amlogic
* 5603b753 UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
* a68e7f0e UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
* 99ad7cb4 UPSTREAM: f2fs: fix to avoid use-after-free for cached IPU bio
* a77c2b7e UPSTREAM: ASoC: soc-pcm: align BE 'atomicity' with that of the FE
* fc49127a UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
* 9a54f9ba UPSTREAM: ASoC: soc-pcm: use GFP_ATOMIC for dpcm structure
* 81eae266 UPSTREAM: Revert "Fix XFRM-I support for nested ESP tunnels"
* 0bae509c UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
* 6d037460 ANDROID: GKI: Update symbol list for Amlogic
* 88667968 ANDROID: ABI: Update oplus symbol list
* 45ad9590 ANDROID: Export memcg functions to allow module to add new files
* ba2ca1ed ANDROID: Update the ABI representation
* 46191df7 ANDROID: vendor_hooks: Export direct reclaim trace points
* 2125796e ANDROID: fuse-bpf: Move FUSE_RELEASE to correct place
* b5f38513 ANDROID: fuse-bpf: Ensure bpf field can never be nulled
* d36d6555 ANDROID: GKI: Increase CMA areas to 32
* 0e10eb9b ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
* 619b61e8 ANDROID: GKI: Update symbol list for xiaomi
* f37fe29d ANDROID: build.config.allmodconfig: Build-in HID and UHID
* 6804500c ANDROID: HID; Over-ride default maximum buffer size when using UHID
* d384eb48 UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
* c6d386b8 BACKPORT: scsi: ufs: core: Fix devfreq deadlocks
* 6bcf6fdd UPSTREAM: xfs: verify buffer contents when we skip log replay
* 902976a8 UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
* acdef492 UPSTREAM: f2fs: skip GC if possible when checkpoint disabling
* 2501e448 ANDROID: ABI: update gki symbol list
* 0574ecdc ANDROID: Add vendor hook for highmem movable page allocations
* 43bb0296 ANDROID: Add vendor hook for precondition check of use_cma_first
* 0a52bf29 BACKPORT: FROMGIT: mm: skip CMA pages when they are not available
* 087877d5 BACKPORT: FROMGIT: mm: optimization on page allocation when CMA enabled
* 9ab065d2 ANDROID: GKI: Update symbol list for Amlogic

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