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

Merge android12-5.10 into android12-5.10-lts



This merges the android12-5.10 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* bc9157dd Merge tag 'android12-5.10.245_r00' into android12-5.10
* a721b467 ANDROID: GKI: Add symbols to symbol list for SUNMI
* 22664d1e UPSTREAM: crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
* b555a950 UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize

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