David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
include	net: initial AF_XDP skeleton	2018-05-03 15:55:23 -07:00
ss	selinux: wrap AVC state	2018-03-20 16:58:17 -04:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
avc.c	selinux: wrap AVC state	2018-03-20 16:58:17 -04:00
exports.c	selinux: sparse fix: include selinux.h in exports.c	2011-09-09 16:56:32 -07:00
hooks.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
ibpkey.c	selinux: wrap global selinux state	2018-03-01 18:48:02 -05:00
Kconfig	security: introduce CONFIG_SECURITY_WRITABLE_HOOKS	2017-03-06 11:00:12 +11:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
netif.c	selinux: wrap global selinux state	2018-03-01 18:48:02 -05:00
netlabel.c	selinux: wrap AVC state	2018-03-20 16:58:17 -04:00
netlink.c	selinux: replace obsolete NLMSG_* with type safe nlmsg_*	2013-03-28 14:25:49 -04:00
netnode.c	selinux: wrap global selinux state	2018-03-01 18:48:02 -05:00
netport.c	selinux: wrap global selinux state	2018-03-01 18:48:02 -05:00
nlmsgtab.c	rtnetlink: add NEWCACHEREPORT message type	2017-06-21 11:22:52 -04:00
selinuxfs.c	selinux: fix missing dput() before selinuxfs unmount	2018-04-09 11:52:56 -07:00
xfrm.c	selinux: wrap AVC state	2018-03-20 16:58:17 -04:00