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

Merge c269497d ("Merge tag 'selinux-pr-20220321' of...

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

) into android-mainline

Steps on the way to 5.18-rc1

Resolves conflicts in:
	security/selinux/include/security.h

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