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

Merge branch 'android12-5.4' into android12-5.4-lts



Sync up with android12-5.4 for the following commits:

487daef4 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
a9527bd8 UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
f5af01b6 UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
ed558a4e BACKPORT: btrfs: unset reloc control if transaction commit fails in prepare_to_relocate()
b0a9bcb9 ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
29b74661 UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
ee7f5996 ANDROID: HID; Over-ride default maximum buffer size when using UHID
39a9b92e UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
63eaf79a UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
e77ffdfd UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
ba78995c UPSTREAM: cdc_ncm: Fix the build warning
dd053bd1 UPSTREAM: cdc_ncm: Implement the 32-bit version of NCM Transfer Block
f0ed73d5 UPSTREAM: io_uring: have io_kill_timeout() honor the request references
7baea36e UPSTREAM: efi: rt-wrapper: Add missing include
b3d6fa66 BACKPORT: arm64: efi: Execute runtime services from a dedicated stack
0ca1f2fd UPSTREAM: io_uring: don't drop completion lock before timer is fully initialized
888c475b UPSTREAM: io_uring: always grab lock in io_cancel_async_work()
10e0626a Merge "Merge tag 'android12-5.4.242_r00' into android12-5.4" into android12-5.4

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