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

The only slightly tricky merge conflict was the netdevsim because the
mutex locking fix overlapped a lot of driver reload reorganization.

The rest were (relatively) trivial in nature.

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

2019-11-02 13:54:56 -07:00

..

apparmor

Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2019-07-19 10:42:02 -07:00

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

proc/sysctl: add shared variables for range check

2019-07-18 17:08:07 -07:00

lockdown

efi/efi_test: Lock down /dev/efi_test and require CAP_SYS_ADMIN

2019-10-31 09:40:21 +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

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

yama

proc/sysctl: add shared variables for range check

2019-07-18 17:08:07 -07:00

commoncap.c

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

2019-07-09 12:24:21 -07:00

device_cgroup.c

docs: cgroup-v1: add it to the admin-guide book

2019-07-15 11:03:02 -03:00

inode.c

Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2019-07-19 10:42:02 -07:00

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

Merge tag 'meminit-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2019-07-28 12:33:15 -07:00

lsm_audit.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500

2019-06-19 17:09:55 +02:00

Makefile

security: Add a static lockdown policy LSM

2019-08-19 21:54:15 -07: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-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

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