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

Merge branch 'android14-5.15' into android14-5.15-lts



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

* 72c5444c Merge tag 'android14-5.15.180_r00' into android14-5.15
* 2be3e25a ANDROID: Repurpose a reserved slot in ipv6_devconf for backports
* bea55354 ANDROID: GKI: Add symbols to symbol list for tcl
* 9ec06c62 ANDROID: GKI: Update RTK STB KMI symbol list
* a8212246 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT
* daaa5f81 FROMGIT: cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
* f0ea2e9a Revert "hrtimers: Handle CPU state correctly on hotplug"
* f9c1fd73 UPSTREAM: f2fs: fix inconsistent dirty state of atomic file
* 81e5a7bd ANDROID: GKI: Update symbol list for mtkott
* 166cd2c9 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0
* b4398c5d UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another
* cdd20753 UPSTREAM: net: avoid race between device unregistration and ethnl ops
* 537268ad UPSTREAM: vsock: Orphan socket after transport release
* 50854473 UPSTREAM: vsock: Keep the binding until socket destruction
* 9241eb16 UPSTREAM: bpf, vsock: Invoke proto::close on close()
* 71244f32 BACKPORT: f2fs: compress: fix inconsistent update of i_blocks in release_compress_blocks and reserve_compress_blocks
* b5ffd823 ANDROID: SPF: Fix swap faults racing with fast-mremap
* 2f429dfd ANDROID: GKI: update mtktv symbol
* fd9ba8dd ANDROID: GKI: Update symbol list for Amlogic

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