David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
apparmor	apparmor: clarify CRYPTO dependency	2015-10-22 11:11:28 +11:00
integrity	ima: fix the string representation of the LSM/IMA hook enumeration ordering	2016-05-04 18:46:00 +10:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
selinux	rtnetlink: add new RTM_GETSTATS message to dump link stats	2016-04-20 15:43:42 -04:00
smack	smack: fix cache of access labels	2016-02-16 09:56:35 -08:00
tomoyo	mm/gup: Introduce get_user_pages_remote()	2016-02-16 10:04:09 +01:00
yama	security: let security modules use PTRACE_MODE_* with bitmasks	2016-01-20 17:09:18 -08:00
Kconfig	Yama: remove needless CONFIG_SECURITY_YAMA_STACKED	2015-07-28 13:18:19 +10:00
Makefile	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
commoncap.c	ptrace: use fsuid, fsgid, effective creds for fs access checks	2016-01-20 17:09:18 -08:00
device_cgroup.c	security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition	2015-09-03 18:13:10 -07:00
inode.c	wrappers for ->i_mutex access	2016-01-22 18:04:28 -05: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
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	module: replace copy_module_from_fd with kernel version	2016-02-21 09:06:12 -05:00