David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
apparmor	+ Features/Improvements	2018-11-02 10:04:26 -07:00
integrity	ima: cleanup the match_token policy code	2018-12-17 16:31:28 -08:00
keys	security: don't use a negative Opt_err token index	2018-12-17 16:21:48 -08:00
loadpin	LoadPin: Rename boot param "enabled" to "enforce"	2018-10-18 15:29:44 -07:00
selinux	net: use skb_sec_path helper in more places	2018-12-19 11:21:37 -08:00
smack	Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2018-10-25 13:29:51 -07:00
tomoyo	LSM: Record LSM name in struct lsm_info	2018-10-10 20:40:22 -07:00
yama	pids: introduce find_get_task_by_vpid() helper	2018-02-06 18:32:46 -08:00
Kconfig	Revert "x86/mm/legacy: Populate the user page-table with user pgd's"	2018-09-14 17:08:45 +02: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	Linux 4.19-rc2	2018-09-04 11:35:54 -07:00
device_cgroup.c	docs: fix broken references with multiple hints	2018-06-15 18:10:01 -03:00
inode.c	securityfs: add the ability to support symlinks	2017-06-08 12:51:43 -07:00
lsm_audit.c	audit: use inline function to get audit context	2018-05-14 17:24:18 -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	Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2018-10-24 11:49:35 +01:00