Alex Shi fa6e6c7406 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts solution:
	keep 'KBUILD_CFLAGS += -fno-pic'
	in arch/arm64/Makefile

2016-03-14 15:32:21 +08:00

..

apparmor

apparmor: clarify CRYPTO dependency

2015-10-22 11:11:28 +11:00

integrity

EVM: Use crypto_memneq() for digest comparisons

2016-02-17 12:31:04 -08:00

keys

UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()

2016-02-16 13:54:23 -08:00

selinux

SELinux: build fix for 4.1

2016-02-16 13:53:57 -08:00

smack

security: let security modules use PTRACE_MODE_* with bitmasks

2016-03-03 15:07:32 -08:00

tomoyo

LSM: Switch to lists of hooks

2015-05-12 15:00:41 +10:00

yama

security: let security modules use PTRACE_MODE_* with bitmasks

2016-03-03 15:07:32 -08:00

commoncap.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2016-02-29 10:18:54 +08:00

device_cgroup.c

security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition

2015-09-03 18:13:10 -07:00

inode.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

Kconfig

Yama: remove needless CONFIG_SECURITY_YAMA_STACKED

2015-07-28 13:18:19 +10:00

lsm_audit.c

Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

2015-08-15 13:29:57 +10:00

Makefile

LSM: Switch to lists of hooks

2015-05-12 15:00:41 +10:00

min_addr.c

…

security.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2015-09-08 12:41:25 -07:00