Merge branch 'android13-5.10' into android13-5.10-lts
Catch the -lts branch up with recent changes made in the main branch: * f2b154db Merge tag 'android13-5.10.236_r00' into android13-5.10 * aaafaeca ANDROID: Repurpose a reserved slot in ipv6_devconf for backports * 2111c0a6 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT * 30aee052 FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode * 44a521be ANDROID: Add Tuxera symbol list * 09b51ea6 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0 * 3b8b12a9 UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another * 3bee03c5 UPSTREAM: vsock: Orphan socket after transport release * 293c130b UPSTREAM: vsock: Keep the binding until socket destruction * 1fadcf55 UPSTREAM: bpf, vsock: Invoke proto::close on close() * 5a07ad10 ANDROID: SPF: Fix swap faults racing with fast-mremap Change-Id: I40024c1cec0ef1faa7dccefbf993480ed71b1c16 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment