David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Small overlapping change conflict ('net' changed a line, 'net-next' added a line right afterwards) in flexcan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-05 10:44:19 -05:00
..
apparmor	bug fixes:	2017-11-30 18:56:41 -05:00
integrity	ima: do not update security.ima if appraisal status is not INTEGRITY_PASS	2017-11-20 08:23:10 +11:00
keys	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-25 08:37:16 -10:00
loadpin	security: mark LSM hooks as __ro_after_init	2017-03-06 11:00:15 +11:00
selinux	net: Create and use new helper xfrm_dst_child().	2017-11-30 09:54:25 -05:00
smack	Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2017-11-13 10:30:44 -08:00
tomoyo	Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2017-11-13 10:30:44 -08:00
yama	doc: ReSTify Yama.txt	2017-05-18 10:33:04 -06:00
Kconfig	include/linux/string.h: add the option of fortified string.h functions	2017-07-12 16:26:03 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
commoncap.c	Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2017-11-13 10:30:44 -08:00
device_cgroup.c	device_cgroup: prepare code for bpf-based device controller	2017-11-05 23:26:51 +09:00
inode.c	securityfs: add the ability to support symlinks	2017-06-08 12:51:43 -07:00
lsm_audit.c	lsm_audit: update my email address	2017-08-17 15:33:39 -04:00
min_addr.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
security.c	security: bpf: Add LSM hooks for bpf object related syscall	2017-10-20 13:32:59 +01:00