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
..
apparmor	+ Features	2018-04-13 15:38:53 -07:00
integrity	ima: Fallback to the builtin hash algorithm	2018-03-25 07:26:32 -04:00
keys	headers: untangle kmemleak.h from mm.h	2018-04-05 21:36:27 -07:00
loadpin	get rid of pointless includes of fs_struct.h	2018-02-22 14:28:50 -05:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
smack	ipc/msg: introduce msgctl(MSG_STAT_ANY)	2018-04-11 10:28:37 -07:00
tomoyo	net: make getname() functions return length rather than use int* parameter	2018-02-12 14:15:04 -05:00
yama	pids: introduce find_get_task_by_vpid() helper	2018-02-06 18:32:46 -08:00
Kconfig	Currently, hardened usercopy performs dynamic bounds checking on slab	2018-02-03 16:25:42 -08: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	commoncap: Handle memory allocation failure.	2018-04-10 19:17:41 -05: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	New features:	2018-04-10 11:27:30 -07:00