Skip to content
Snippets Groups Projects
Commit d1a25a6a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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


This catches the -lts branch up with recent changes made in the non-lts
branch.  Commits included in here are:

* e51e4e9e Merge tag 'android13-5.15.176_r00' into android13-5.15
* 6924898b UPSTREAM: selinux: ignore unknown extended permissions
* 9bc61f55 UPSTREAM: cgroup: remove cgroup_rstat_flush_atomic()
* bf8a678b UPSTREAM: memcg: remove mem_cgroup_flush_stats_atomic()
* 2d365248 UPSTREAM: memcg: calculate root usage from global state
* e90f69d2 UPSTREAM: memcg: flush stats non-atomically in mem_cgroup_wb_stats()
* 2ceb8b56 UPSTREAM: writeback: move wb_over_bg_thresh() call outside lock section
* 7c8a6d91 UPSTREAM: memcg: do not modify rstat tree for zero updates
* 564545cd UPSTREAM: vmscan: memcg: sleep when flushing stats during reclaim
* 657b9fd1 UPSTREAM: workingset: memcg: sleep when flushing stats in workingset_refault()
* 15b09f7d UPSTREAM: memcg: sleep during flushing stats in safe contexts
* d8241010 UPSTREAM: memcg: replace stats_flush_lock with an atomic
* 284cdd26 UPSTREAM: memcg: do not flush stats in irq context
* 691defd5 UPSTREAM: memcg: rename mem_cgroup_flush_stats_"delayed" to "ratelimited"
* 857efcc9 UPSTREAM: cgroup: rename cgroup_rstat_flush_"irqsafe" to "atomic"
* df6f032d UPSTREAM: bpf: sync_linked_regs() must preserve subreg_def
* 18b357e8 UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug
* 016454a4 ANDROID: GKI: Update oplus symbol list
* f0b678d6 UPSTREAM: dma-fence: Fix reference leak on fence merge failure path
* e4fc6545 UPSTREAM: dma-buf: fix an error pointer vs NULL bug
* 434df6e9 UPSTREAM: dma-buf: actually set signaling bit for private stub fences
* 2ada558f UPSTREAM: dma-buf: set signaling bit for the stub fence
* c2683a24 UPSTREAM: dma-buf/sync_file: use strscpy to replace strlcpy
* 10b365ae BACKPORT: dma-buf: generalize dma_fence unwrap & merging v3
* e6dffae9 BACKPORT: dma-buf: keep the signaling time of merged fences v3
* 4a5151ef BACKPORT: dma-buf: cleanup dma_fence_unwrap implementation
* 7aa4d35d UPSTREAM: dma-buf: cleanup dma_fence_unwrap selftest v2
* c5bbb6a7 UPSTREAM: dma-buf: handle empty dma_fence_arrays gracefully
* dfbbe15b UPSTREAM: ALSA: usb-audio: Fix out of bounds reads when finding clock sources
* 027e32a2 UPSTREAM: ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices

Change-Id: I3c90653397c76dd75bff6626a02b32c4db0262ff
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c5633868 e51e4e9e
No related branches found
No related tags found
No related merge requests found
Showing with 2102 additions and 1992 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment