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

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

Merge branch 'android11-5.4' into android11-5.4-lts



Catch up with a few commits in android11-5.4 to hopefully "unbreak"
gerrit as it is confused a bit with the branches being able to be
cleanly "fast-forwarded" at the moment.  Changes in here include the
following:

* a8200588 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 8ee3ff60 Merge tag 'android11-5.4.286_r00' into android11-5.4
* ac5c9c9b UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
* e3a8df30 ANDROID: add file for recording allowed ABI breaks
* 0215dc28 ANDROID: declare sp_in_global outside of CONFIG_FRAME_POINTER
* f06e9ec9 BACKPORT: RISC-V: Stop relying on GCC's register allocator's hueristics
* fd0bf47f UPSTREAM: x86/percpu: Clean up percpu_add_op()
* cdc0c697 UPSTREAM: x86/percpu: Clean up percpu_from_op()
* c35e6d00 UPSTREAM: x86/percpu: Clean up percpu_to_op()
* 3cd2aa35 UPSTREAM: x86/percpu: Introduce size abstraction macros
* fd66950d BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* d7f2e260 BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* 00553a45 FROMGIT: binder: allow freeze notification for dead nodes
* 44e90a12 FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 4942a671 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* dd5ff843 BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work()
* 69532698 FROMGIT: binder: fix OOB in binder_add_freeze_work()
* b6005f2f FROMGIT: binder: fix node UAF in binder_add_freeze_work()
* 069e1298 ANDROID: GKI: Enable SERIAL_8250_DW
* acda6f32 UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format

Change-Id: I70df16a9075c4cf9e0bafdc129f0a7a0f6b79d0f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3871647e a8200588
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