David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-09-26 16:08:27 -07:00

..

apparmor

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

integrity

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

keys

capabilities: ambient capabilities

2015-09-04 16:54:41 -07:00

selinux

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

2015-09-18 22:00:16 +02:00

smack

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

2015-09-18 22:00:16 +02:00

tomoyo

LSM: Switch to lists of hooks

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

yama

Adding YAMA hooks also when YAMA is not stacked.

2015-08-04 01:36:18 +10:00

commoncap.c

capabilities: add a securebit to disable PR_CAP_AMBIENT_RAISE

2015-09-04 16:54:41 -07: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

mmap_min_addr check CAP_SYS_RAWIO only for write

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

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