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

Merge android13-5.15 into android13-5.15-lts



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

It contains the following commits:

* f7dbe96d Merge tag 'android13-5.15.182_r00' into android13-5.15
* 70ff3b45 ANDROID: binder: fix minimum node priority comparison
* c128f36c UPSTREAM: PCI/ASPM: Fix L1SS saving
* bfdd4619 UPSTREAM: PCI/ASPM: Save parent L1SS config in pci_save_aspm_l1ss_state()
* daab5d89 ANDROID: 16K: Remove ELF padding entry from map_file ranges
* 0caacc39 ANDROID: ABI: Add to QCOM symbols list
* edfaa2dd UPSTREAM: binder: fix potential UAF of target_{proc,thread}
* b9a389ca ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM
* 74fde720 ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler
* 46cd1ff9 ANDROID: mm/memfd-ashmem-shim: Introduce shim layer

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