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

Merge android14-5.15 into android14-5.15-lts



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

It contains the following commits:

* 5804ade5 ANDROID: GKI: Update symbol list for Amlogic
* 89928190 Merge tag 'android14-5.15.192_r00' into android14-5.15
* d82776a1 BACKPORT: mm/userfaultfd: fix uninitialized output field for -EAGAIN race
* cc5d9e19 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* b444b2e4 ANDROID: KVM: arm64: size overflow checks for mem_protect HVCs
* 1af18e1d UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* 7baa61f0 ANDROID: GKI: Update symbol list for Amlogic
* 48babe85 ANDROID: KVM: arm64: Fix CPU type when reading trace_pdesc
* fa45b132 UPSTREAM: f2fs: fix to avoid UAF in f2fs_sync_inode_meta()
* 8d35c119 UPSTREAM: perf/core: Fix potential NULL deref
* ae5f2e3f UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()

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