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

Conflicts:
	included wakeup_reason.h file of 57caa2ad5c in kernel/power/process.c

2017-10-13 23:14:45 +08:00

..

apparmor

apparmor: fix change_hat not finding hat after policy replacement

2016-12-02 09:09:01 +01:00

integrity

ima: accept previously set IMA_NEW_FILE

2017-05-25 14:30:09 +02:00

keys

KEYS: prevent KEYCTL_READ on negative key

2017-10-05 09:41:45 +02:00

selinux

UPSTREAM: selinux: enable genfscon labeling for tracefs

2017-07-10 16:29:53 +05:30

smack

lsm: fix smack_inode_removexattr and xattr_getsecurity memleak

2017-10-12 11:27:32 +02: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

ANDROID: vfs: Add permission2 for filesystems with per mount permissions

2017-02-03 15:04:29 +05:30

Kconfig

usercopy: remove page-spanning test for now

2016-09-24 11:41:19 +08:00

lsm_audit.c

BACKPORT: audit: consistently record PIDs with task_tgid_nr()

2016-10-12 17:34:22 +05:30

Makefile

LSM: Switch to lists of hooks

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

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

ANDROID: security: export security_path_chown()

2017-02-06 23:34:58 +05:30