Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ... Conflicts due to AOSP's backported commits: fs/f2fs/crypto.c fs/f2fs/crypto_fname.c Deleted by AOSP commit c1286ff41c2f ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)") fs/f2fs/crypto_key.c fs/f2fs/data.c fs/f2fs/file.c AOSP commit 13f002354db1 ("f2fs: catch up to v4.14-rc1") override most of stable 4.4.y changes. Signed-off-by: Amit Pundir <amit.pundir@linaro.org>		2017-11-20 20:53:19 +05:30
..
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	security/keys: add CONFIG_KEYS_COMPAT to Kconfig	2017-11-18 11:11:07 +01: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
security.c	ANDROID: security: export security_path_chown()	2017-02-06 23:34:58 +05:30