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

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



This catches the -lts branch up with all of the recent changes that have
gone into the non-lts branch, INCLUDING the ABI update which we want
here to ensure that we do NOT break any newly added dependent symbols
(and to bring back in the reverts that were required before the ABI
break).

This includes the following commits:

5c138afc ANDROID: GKI: Include kheaders in gki_system_dlkm_modules
f025c9bd ANDROID: 6/16/2023 KMI update
d05f5134 ANDROID: GKI: provide more padding for struct usb_phy
e010dc36 UPSTREAM: neighbour: fix unaligned access to pneigh_entry
abe40769 UPSTREAM: net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down
00ce9cfb ANDROID: GKI: Update symbol list for Amlogic
45e4388a ANDROID: GKI enable CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
78f4244d BACKPORT: cgroup/cpuset: Free DL BW in case can_attach() fails
72c81004 BACKPORT: sched/deadline: Create DL BW alloc, free & check overflow interface
71cf567d FROMGIT: cgroup/cpuset: Iterate only if DEADLINE tasks are present
16a812c0 BACKPORT: sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets
0dfe87df BACKPORT: sched/cpuset: Bring back cpuset_mutex
2a32b2b9 FROMGIT: cgroup/cpuset: Rename functions dealing with DEADLINE accounting
1351520d ANDROID:  6/16/2023 KMI update
0270aeeb UPSTREAM: binder: fix UAF of alloc->vma in race with munmap()
b094b047 UPSTREAM: binder: add lockless binder_alloc_(set|get)_vma()
acd8193f UPSTREAM: Revert "android: binder: stop saving a pointer to the VMA"
45efb0a2 UPSTREAM: Revert "binder_alloc: add missing mmap_lock calls when using the VMA"
bc4e0df3 UPSTREAM: usb: dwc3: fix gadget mode suspend interrupt handler issue
b03d86bd UPSTREAM: usb: gadget: Properly configure the device for remote wakeup
49cb2707 UPSTREAM: tcp: deny tcp_disconnect() when threads are waiting
744ad30e ANDROID: GKI: Add RTK STB KMI symbol list
faaabc7a ANDROID: Remove all but top-level OWNERS
88bfbed3 ANDROID: Enable GKI Dr. No Enforcement

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