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	apparmor: add mount mediation	2017-09-22 13:00:57 -07:00
apparmorfs.h	apparmor: add policy revision file interface	2017-06-10 17:11:27 -07:00
audit.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
capability.h	apparmor: move capability checks to using labels	2017-06-10 17:11:40 -07:00
context.h	apparmor: switch from profiles to using labels on contexts	2017-06-10 17:11:38 -07:00
crypto.h	apparmor: allow introspecting the loaded policy pre internal transform	2017-01-16 01:18:42 -08:00
domain.h	+ Features	2017-09-23 05:33:29 -10:00
file.h	apparmor: Refactor to remove bprm_secureexec hook	2017-08-01 12:03:06 -07:00
ipc.h	apparmor: add the ability to mediate signals	2017-09-22 13:00:57 -07:00
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	apparmor: fix restricted endian type warnings for dfa unpack	2017-01-16 01:18:54 -08:00
mount.h	apparmor: add mount mediation	2017-09-22 13:00:57 -07:00
path.h	apparmor: Move path lookup to using preallocated buffers	2017-06-08 11:29:34 -07:00
perms.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
policy_ns.h	apparmor: switch from profiles to using labels on contexts	2017-06-10 17:11:38 -07:00
policy_unpack.h	apparmor: move to per loaddata files, instead of replicating in profiles	2017-06-08 12:51:49 -07:00
policy.h	Revert "apparmor: add base infastructure for socket mediation"	2017-10-26 19:35:35 +02:00
procattr.h	apparmor: switch getprocattr to using label_print fns()	2017-06-10 17:11:39 -07:00
resource.h	apparmor: move resource checks to using labels	2017-06-10 17:11:40 -07:00
secid.h	apparmor: rename sid to secid	2017-01-16 00:42:17 -08:00
sig_names.h	apparmor: fix build failure on sparc caused by undeclared signals	2017-09-22 13:00:58 -07:00