github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
68d0da6f3e
linux/security/smack
History
Greg Kroah-Hartman a14ed4197e Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline 
Steps on the way to 5.11-rc1

Resolves conflicts in:
	arch/arm64/include/asm/thread_info.h
	fs/proc/base.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibc53e7c14fc0953a95f89af81b0e0373ddad986a
2020-12-19 16:06:54 +01:00
..
Kconfig treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
smack_access.c Smack: Use the netlabel cache 2020-09-11 15:31:31 -07:00
smack_lsm.c Merge 69f637c335 ("Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block") into android-mainline 2020-12-19 16:06:54 +01:00
smack_netfilter.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
smack.h Smack: Use the netlabel cache 2020-09-11 15:31:31 -07:00
smackfs.c Smack: fix kernel-doc interface on functions 2020-11-13 11:50:44 -08:00