Merge android11-5.4 into android11-5.4-lts

Browse source

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

It contains the following commits:

* d13b9b5a0a Merge tag 'android11-5.4.301_r00' into android11-5.4
* 0a4bf073fa UPSTREAM: crypto: essiv - Check ssize for decryption and in-place encryption

Change-Id: Idb4a56ab4715ae9c3698fe753cb76aa9be37a1a5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman 2025-11-24 12:36:01 +00:00

parent 6c4d697461 d13b9b5a0a

commit 7bf580b201

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available