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

Conflicts were all overlapping changes.

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

2020-05-06 22:10:13 -07:00

..

apparmor

sysctl: pass kernel pointers to ->proc_handler

2020-04-27 02:07:40 -04:00

bpf

bpf: lsm: Initialize the BPF LSM hooks

2020-03-30 01:34:00 +02:00

integrity

Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

2020-04-02 14:49:46 -07:00

keys

keys: Fix proc_keys_next to increase position index

2020-04-16 10:10:50 -07:00

loadpin

proc/sysctl: add shared variables for range check

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

lockdown

security,lockdown,selinux: implement SELinux lockdown

2019-12-09 17:53:58 -05:00

safesetid

security/safesetid: Replace rcu_swap_protected() with rcu_replace_pointer()

2019-10-30 08:45:57 -07:00

selinux

Merge tag 'selinux-pr-20200430' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

2020-04-30 16:35:45 -07:00

smack

Merge branch 'merge.nfs-fs_parse.1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2020-02-08 13:26:41 -08:00

tomoyo

.gitignore: add SPDX License Identifier

2020-03-25 11:50:48 +01:00

yama

sysctl: pass kernel pointers to ->proc_handler

2020-04-27 02:07:40 -04: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

device_cgroup: Export devcgroup_check_permission

2019-10-07 15:11:38 -05: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

bpf: lsm: Initialize the BPF LSM hooks

2020-03-30 01:34:00 +02: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

security,lockdown,selinux: implement SELinux lockdown

2019-12-09 17:53:58 -05:00

Makefile

bpf: lsm: Initialize the BPF LSM hooks

2020-03-30 01:34:00 +02:00

min_addr.c

sysctl: pass kernel pointers to ->proc_handler

2020-04-27 02:07:40 -04:00

security.c

security: Refactor declaration of LSM hooks

2020-03-30 01:34:00 +02:00