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

Merge 72eaa096 ("Merge tag 'selinux-pr-20230420' of...

Merge 72eaa096 ("Merge tag 'selinux-pr-20230420' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux"

) into android-mainline

Steps on the way to 6.4-rc1

Resolves merge conflicts with:
	security/selinux/include/security.h

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