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
selinux	rtnetlink: Add RTM_DELNETCONF	2017-03-28 22:32:42 -07:00
smack
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
commoncap.c
device_cgroup.c
inode.c
Kconfig
lsm_audit.c
Makefile
min_addr.c
security.c