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

Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

2018-04-13 15:38:53 -07:00

integrity

…

keys

…

loadpin

…

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

…

yama

…

commoncap.c

commoncap: Handle memory allocation failure.

2018-04-10 19:17:41 -05:00

device_cgroup.c

…

inode.c

…

Kconfig

…

lsm_audit.c

…

Makefile

…

min_addr.c

…

security.c

Merge tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2018-04-10 11:27:30 -07:00