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

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



Catch the -lts branch up with changes made to the android13-5.15 branch:

* dfb6f277 Merge tag 'android13-5.15.180_r00' into android13-5.15
* e59b2ba4 ANDROID: Repurpose a reserved slot in ipv6_devconf for backports
* 799d84c5 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT
* 7e38a442 FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
* fca4978d UPSTREAM: usb: dwc3: Fix timeout issue during controller enter/exit from halt state
* b00a7c5d FROMGIT: f2fs: fix the wrong condition to determine atomic context
* b9c7089e Revert "hrtimers: Handle CPU state correctly on hotplug"
* 2fa1cbcd FROMGIT: f2fs: fix scheduling while atomic in decompression path
* 46c313d5 ANDROID: ABI: update symbol list for honor
* 3b2898e3 FROMGIT: f2fs: fix to avoid atomicity corruption of atomic file
* 79690c15 UPSTREAM: vsock: Orphan socket after transport release
* 8685fa33 UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another
* 8ca0ee97 UPSTREAM: net: avoid race between device unregistration and ethnl ops
* 30b004c5 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0
* cf9091eb UPSTREAM: vsock: Keep the binding until socket destruction
* 1f79931f UPSTREAM: bpf, vsock: Invoke proto::close on close()
* 510fd263 ANDROID: fix missing ACK from netns in TIME_WAIT state
* 8b83b87a BACKPORT: f2fs: compress: fix inconsistent update of i_blocks in release_compress_blocks and reserve_compress_blocks
* e385b2f5 ANDROID: SPF: Fix swap faults racing with fast-mremap
* 99526711 ANDROID: GKI: Add symbol list for Volvo devices
* beb77c51 ANDROID: GKI: Update oplus symbol list
* 92f778b7 BACKPORT: block, bfq: fix UAF problem in bfqg_stats_init()
* 80eac4a7 ANDROID: GKI: Update symbol list for mtk

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