Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b2efed2e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android11-5.4 into android11-5.4-lts



This merges the android11-5.4 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 4d9a7219 Merge tag 'android11-5.4.296_r00' into android11-5.4
* e4601d0b ANDROID: 16K: Allocate pad vma on the stack
* 2f1e2df2 ANDROID: 16K: Don't copy data vma for maps/smaps output
* 7802e7ac ANDROID: GKI: update Trimble symbol list
* 1e819177 UPSTREAM: net/sched: Always pass notifications when child class becomes empty
* 387dbb9a ANDROID: bpf: do not fail to load if log is full

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