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

Merge efd1df19 ("Merge tag 'selinux-pr-20220523' of...

Merge efd1df19 ("Merge tag 'selinux-pr-20220523' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux"

) into android-mainline

Steps on the way to 5.19-rc1

Resolves merge conflict in:
	security/selinux/nlmsgtab.c

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