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: * 5e2e421a Merge tag 'android12-5.10.237_r00' into android12-5.10 * 343ef855 ANDROID: binder: fix minimum node priority comparison * ee3115c3 ANDROID: 16K: Remove ELF padding entry from map_file ranges * 095bd819 UPSTREAM: binder: fix potential UAF of target_{proc,thread} * 18290a0b ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM * 6e4f4911 ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler * 51dd372c ANDROID: mm/memfd-ashmem-shim: Introduce shim layer * e36db2ad Revert "hrtimers: Handle CPU state correctly on hotplug" Change-Id: Id79ad6da67f620a7c66dff137db190bd20968f1c Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment