David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
include	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372	2019-06-05 17:37:10 +02:00
ss	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372	2019-06-05 17:37:10 +02:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
avc.c	selinux: log raw contexts as untrusted strings	2019-06-11 18:35:51 -04:00
hooks.c	selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts()	2019-06-12 12:27:26 -04:00
ibpkey.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	SELinux: Remove unused selinux_is_enabled	2019-01-08 13:18:44 -08:00
netif.c	selinux: Cleanup printk logging in netif	2018-06-19 13:45:31 -04:00
netlabel.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
netlink.c	selinux: Cleanup printk logging in netlink	2018-06-19 13:33:05 -04:00
netnode.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
netport.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
nlmsgtab.c	net: nexthop uapi	2019-05-28 21:37:30 -07:00
selinuxfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372	2019-06-05 17:37:10 +02:00
xfrm.c	SELinux: Abstract use of cred security blob	2019-01-08 13:18:44 -08:00