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

Merge branch 'linus' into locking/core, to resolve conflicts

2017-11-07 10:32:44 +01:00

integrity

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

keys

Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2017-11-02 10:04:46 -07:00

loadpin

security: mark LSM hooks as __ro_after_init

2017-03-06 11:00:15 +11:00

selinux

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

smack

lsm: fix smack_inode_removexattr and xattr_getsecurity memleak

2017-10-04 18:03:15 +11:00

tomoyo

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

yama

doc: ReSTify Yama.txt

2017-05-18 10:33:04 -06:00

commoncap.c

commoncap: move assignment of fs_ns to avoid null pointer dereference

2017-10-19 13:09:33 +11:00

device_cgroup.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

inode.c

securityfs: add the ability to support symlinks

2017-06-08 12:51:43 -07:00

Kconfig

include/linux/string.h: add the option of fortified string.h functions

2017-07-12 16:26:03 -07:00

lsm_audit.c

lsm_audit: update my email address

2017-08-17 15:33:39 -04:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

min_addr.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

security.c

Merge tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

2017-09-12 13:21:00 -07:00