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

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:

* f06b723c Merge tag 'android12-5.10.243_r00' into android12-5.10
* e686428f BACKPORT: mm/userfaultfd: fix uninitialized output field for -EAGAIN race
* 933b7639 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* 67f15774 UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* 9d038341 BACKPORT: FROMGIT: f2fs: add reserved nodes for privileged users
* 070f0e34 FROMGIT: f2fs: fix condition in __allow_reserved_blocks()
* effada2c UPSTREAM: perf/core: Fix potential NULL deref
* b7815803 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()

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