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

Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

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

2015-10-02 07:21:25 -07:00

..

apparmor

…

integrity

…

keys

KEYS: Fix race between key destruction and finding a keyring by name

2015-09-25 16:30:08 +01: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

…

yama

…

commoncap.c

capabilities: add a securebit to disable PR_CAP_AMBIENT_RAISE

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

device_cgroup.c

…

inode.c

…

Kconfig

…

lsm_audit.c

…

Makefile

…

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