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

Merge android13-5.10 into android13-5.10-lts



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

It contains the following commits:

* 7f29806c Merge tag 'android13-5.10.245_r00' into android13-5.10
* cff934b6 ANDROID: crypto: af_alg - Fix assignment from bitfield
* 2da0075c UPSTREAM: crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
* 79d1ab8b UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize

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