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

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

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



Sync up with the android11-5.4 branch to take some additional changes.

This includes the following changes:

91f70257 UPSTREAM: arm64: efi: Make efi_rt_lock a raw_spinlock
bdde16a5 Merge tag 'android11-5.4.254_r00' into android11-5.4
627da86f UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
9f659ee1 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
ca2edd4a UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
e749a1df UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
620d5b6b UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
b91825e0 BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I569d4fa756b3bebbd4e732c679003904a17e399d
parents 8a932792 91f70257
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