David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Several cases of overlapping changes which were for the most
part trivially resolvable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-10-20 10:43:00 -07:00

..

apparmor

…

integrity

integrity: remove pointless subdir-$(CONFIG_...)

2019-10-05 15:29:49 +09:00

keys

KEYS: trusted: correctly initialize digests and fix locking issue

2019-09-25 02:43:53 +03:00

loadpin

…

lockdown

security: constify some arrays in lockdown LSM

2019-09-10 13:27:38 +01:00

safesetid

LSM: SafeSetID: Stop releasing uninitialized ruleset

2019-09-17 11:27:05 -07:00

selinux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-10-20 10:43:00 -07:00

smack

Merge tag 'smack-for-5.4-rc1' of git://github.com/cschaufler/smack-next

2019-09-23 14:25:45 -07:00

tomoyo

…

yama

…

commoncap.c

…

device_cgroup.c

…

inode.c

…

Kconfig

Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2019-09-28 08:14:15 -07:00

Kconfig.hardening

…

lsm_audit.c

…

Makefile

security: Add a static lockdown policy LSM

2019-08-19 21:54:15 -07:00

min_addr.c

…

security.c

Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2019-09-28 08:14:15 -07:00