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

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



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

* 006db224 UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()
* d9c4727e Merge tag 'android13-5.10.223_r00' into android13-5.10
* 6a1de5f5 FROMLIST: binder: fix UAF caused by offsets overwrite
* 88ace9db ANDROID: GKI: remove export of tracing control functions
* 1c323d5f ANDROID: GKI: update symbols to telechips symbol list
* fcc95b0a ANDROID: Fix scmi driver for platform do not have a a2p interrupt
* 97c83fe3 ANDROID: GKI: rockchip: Add symbols for some 4g dongle.
* e5da0a6e ANDROID: Incremental fs: Retry page faults on non-fatal errors
* f92e323f UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
* f2184634 ANDROID: update ABI XML due to struct clk_core change

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