Commit 2bbc2937 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:

* 18b8fe9b ANDROID: GKI: Update symbol list for sunxi
* 0adf7888 ANDROID: GKI: Update symbol list for Amlogic
* 75b7fbec Merge tag 'android13-5.15.192_r00' into android13-5.15
* 8adca690 BACKPORT: f2fs: fix potential deadloop in prepare_compress_overwrite()
* 6a36478b BACKPORT: mm/userfaultfd: fix uninitialized output field for -EAGAIN race
* ffb10876 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* 81fad419 BACKPORT: bpf: Add dmabuf iterator
* 0634f184 BACKPORT: dma-buf: Rename debugfs symbols
* 52f37b5f UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* cc313105 BACKPORT: FROMGIT: f2fs: add reserved nodes for privileged users
* 562ee9d8 ANDROID: GKI: Honor add symbols to symbol list
* 882ce3c6 ANDROID: mm: add vendor hook to add page to specific memcg
* 1596b9fb FROMGIT: f2fs: fix condition in __allow_reserved_blocks()
* dd6425f9 ANDROID: GKI: Update symbol list for Amlogic
* 8b216d56 UPSTREAM: perf/core: Fix potential NULL deref
* 58eb6265 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()

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