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

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



Catch up the -lts branch with the recent backmerge and some smaller
changes.  Included in here are the following commits:

* 95fd17f4 Merge tag 'android12-5.10.223_r00' into android12-5.10
* 5a3d6440 ANDROID: Update the GKI symbol list and ABI XML
* 134a56fc ANDROID: irqchip/irq-gic-v3: Add vendor hook for gic suspend
* c2201dde FROMLIST: binder: fix UAF caused by offsets overwrite
* 68af227b ANDROID: gki - set CONFIG_USB_NET_AX88179_178A=y (usb gbit ethernet dongle)
* d66c0899 ANDROID: gki - CONFIG_USB_NET_AX8817X=y
* eeb46257 ANDROID: GKI: Update symbols to symbol list
* 75410156 ANDROID: GKI: remove export of tracing control functions
* 08892fdf ANDROID: Incremental fs: Retry page faults on non-fatal errors
* 686e8cd4 ANDROID: update ABI XML due to struct clk_core change
* 5a64f757 UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

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