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

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

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

2017-04-21 20:23:53 -07:00

..

apparmor

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

integrity

sched/headers: Prepare to remove the <linux/magic.h> include from <linux/sched/task_stack.h>

2017-03-02 08:42:40 +01:00

keys

KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings

2017-04-18 15:31:49 +01:00

loadpin

LSM: Add /sys/kernel/security/lsm

2017-01-19 13:18:29 +11:00

selinux

rtnetlink: Add RTM_DELNETCONF

2017-03-28 22:32:42 -07:00

smack

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2017-02-23 20:33:51 -08:00

tomoyo

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

yama

LSM: Add /sys/kernel/security/lsm

2017-01-19 13:18:29 +11:00

commoncap.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2017-02-23 20:33:51 -08:00

device_cgroup.c

security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition

2015-09-03 18:13:10 -07:00

inode.c

LSM: Add /sys/kernel/security/lsm

2017-01-19 13:18:29 +11:00

Kconfig

Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper()

2017-01-19 12:59:45 +01:00

lsm_audit.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2016-10-04 14:48:27 -07:00

Makefile

LSM: LoadPin for kernel file loading restrictions

2016-04-21 10:47:27 +10:00

min_addr.c

…

security.c

Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into next

2017-02-10 10:28:49 +11:00