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

Merge branch 'android12-5.10' into android12-5.10-lts



Catch the -lts branch up with changes made in android12-5.10

* bbe79bed Merge tag 'android12-5.10.236_r00' into android12-5.10
* d634ca8a ANDROID: Repurpose a reserved slot in ipv6_devconf for backports
* 9ae83ef4 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT
* 27fa3e9e FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
* 4fd7634f UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another
* 49a145b8 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0
* 115d8eb7 UPSTREAM: vsock: Orphan socket after transport release
* dc23ab93 UPSTREAM: vsock: Keep the binding until socket destruction
* c27dd6dc UPSTREAM: bpf, vsock: Invoke proto::close on close()
* 6a9e785f BACKPORT: f2fs: compress: fix inconsistent update of i_blocks in release_compress_blocks and reserve_compress_blocks
* 6a4157a8 ANDROID: SPF: Fix swap faults racing with fast-mremap

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