Commit c269e0d0 authored by Carlos Llamas's avatar Carlos Llamas
Browse files

Merge 59c017ce ("Merge tag 'selinux-pr-20250323' of...

Merge 59c017ce ("Merge tag 'selinux-pr-20250323' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux"

) into android-mainline

Steps on the way to v6.15-rc1

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

Cc: Thiébaud Weksteen <tweek@google.com>
Change-Id: I2655437c8b6130f1fc6222aa31ea7a5d5a1ef3a1
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents ec456c91 59c017ce
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment