David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
apparmor	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-24 13:47:27 -07:00
bpf
integrity	evm: Fix a small race in init_desc()	2020-05-14 19:55:54 -04:00
keys	keys: Fix proc_keys_next to increase position index	2020-04-16 10:10:50 -07:00
loadpin
lockdown
safesetid
selinux	bpf, capability: Introduce CAP_BPF	2020-05-15 17:29:41 +02:00
smack
tomoyo
yama	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04:00
commoncap.c	exec: Always set cap_ambient in cap_bprm_set_creds	2020-05-26 13:11:00 -05:00
device_cgroup.c	device_cgroup: Cleanup cgroup eBPF device filter code	2020-04-13 14:41:54 -04:00
inode.c
Kconfig
Kconfig.hardening
lsm_audit.c
Makefile	device_cgroup: Cleanup cgroup eBPF device filter code	2020-04-13 14:41:54 -04:00
min_addr.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04:00
security.c	security: Fix hook iteration for secid_to_secctx	2020-05-20 20:12:07 -07:00