Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ... Conflicts: include/linux/compiler-clang.h include/linux/compiler-gcc.h include/linux/compiler-intel.h include/uapi/linux/stddef.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-11-07 10:32:44 +01:00
..
apparmor.h	…
apparmorfs.h	…
audit.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
capability.h	…
context.h	…
crypto.h	…
domain.h	+ Features	2017-09-23 05:33:29 -10:00
file.h	…
ipc.h	…
label.h	apparmor: add support for absolute root view based labels	2017-09-22 13:00:58 -07:00
lib.h	locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() with lockdep	2017-10-10 11:50:17 +02:00
match.h	…
mount.h	…
path.h	…
perms.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
policy.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
policy_ns.h	…
policy_unpack.h	…
procattr.h	…
resource.h	…
secid.h	…
sig_names.h	apparmor: fix build failure on sparc caused by undeclared signals	2017-09-22 13:00:58 -07:00