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

Merge 57888f7b ("Merge tag 'selinux-pr-20221212' of...

Merge 57888f7b ("Merge tag 'selinux-pr-20221212' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux"

) into android-mainline

Steps on the way to 6.2-rc1

Resolves conflicts with:
	security/selinux/ss/services.c

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