Commit 47ea8deb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Giuliano Procida
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



Catch the android13-5.10-lts branch up with recent changes made in the
android13-5.10 branch.  Included in here are the following commits:

* b263a7ce Merge tag 'android13-5.10.218_r00' into android13-5.10
* c75b369e ANDROID: userfaultfd: Fix use-after-free in userfaultfd_using_sigbus()
* 2bef82f1 ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
* a39945bc Merge tag 'android13-5.10.214_r00' into android13-5.10
* 91cf3086 UPSTREAM: af_unix: Fix garbage collector racing against connect()
* 38965378 ANDROID: 16K: Only check basename of linker context
* ef1bbb3d UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* 8b3b0f2a ANDROID: Pixel: Add missing symbol to symbol list
* e1fa3992 BACKPORT: USB: gadget: core: create sysfs link between udc and gadget
* 30cc58af ANDROID: Add __nocfi return for swsusp_arch_resume
* 51e48339 ANDROID: ABI fixup for abi break in struct dst_ops
* 3856ad0c BACKPORT: net: fix __dst_negative_advice() race

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