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

Merge branch 'android12-5.10' into `android12-5.10-lts`



Sync up with android12-5.10 for the following commits:

6c341743 ANDROID: kernel: fix module info for debug_kinfo
774f1bd2 ANDROID: Disable CFI on restricted vendor hooks in TRACE_HEADER_MULTI_READ
90c60a51 UPSTREAM: f2fs: guarantee to write dirty data when enabling checkpoint back
8cf5bb69 UPSTREAM: mm: memblock: fix section mismatch warning again
f00a5430 FROMLIST: usb: gadget: u_audio: EP-OUT bInterval in fback frequency
3f26745c FROMLIST: usb: gadget: f_uac2: fixed EP-IN wMaxPacketSize
ab9ceb43 FROMLIST: usb: gadget: f_uac2: Add missing companion descriptor for feedback EP
35afadf0 FROMLIST: thermal: Fix a NULL pointer dereference
3d371f08 UPSTREAM: usb: gadget: f_uac2: fixup feedback endpoint stop
406a51b4 UPSTREAM: usb: gadget: u_audio: add real feedback implementation
d33287ac UPSTREAM: usb: gadget: f_uac2: add adaptive sync support for capture
c71892dd UPSTREAM: usb: gadget: f_uac2/u_audio: add feedback endpoint support
a844dfbb UPSTREAM: usb: gadget: u_audio: convert to strscpy
955f9172 ANDROID: vendor_hooks: Add hook in try_to_unmap_one()
878e0caa ANDROID: vendor_hooks: Add hook in mmap_region()
b0778aaf ANDROID: vendor_hooks: export android_vh_kmalloc_slab
94fbab9d ANDROID: vendor_hooks: Add hook in kmalloc_slab()
73839b71 FROMGIT: usb: dwc3: Decouple USB 2.0 L1 & L2 events
2c68b907 ANDROID: GKI: update xiaomi symbol list
8da32d52 ANDROID: cfi: explicitly clear diag in __cfi_slowpath

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