Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -07:00
..
include	selinux/stable-5.12 PR 20210322	2021-03-22 11:34:31 -07:00
ss	selinux/stable-5.12 PR 20210409	2021-04-09 11:51:06 -07:00
.gitignore	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
avc.c	selinux: mark some global variables __ro_after_init	2021-01-12 10:08:55 -05:00
hooks.c	idmapped-mounts-v5.12	2021-02-23 13:39:45 -08:00
ibpkey.c	selinux: remove unused global variables	2021-01-12 09:49:01 -05:00
ima.c	selinux: include a consumer of the new IMA critical data hook	2021-01-14 23:41:46 -05:00
Kconfig	Documentation,selinux: deprecate setting checkreqprot to 1	2020-02-10 10:49:01 -05:00
Makefile	selinux: include a consumer of the new IMA critical data hook	2021-01-14 23:41:46 -05:00
netif.c	selinux: remove unused global variables	2021-01-12 09:49:01 -05:00
netlabel.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
netlink.c	selinux: mark some global variables __ro_after_init	2021-01-12 10:08:55 -05:00
netnode.c	selinux: remove unused global variables	2021-01-12 09:49:01 -05:00
netport.c	selinux: remove unused global variables	2021-01-12 09:49:01 -05:00
nlmsgtab.c	nexthop: Add netlink defines and enumerators for resilient NH groups	2021-03-11 16:12:59 -08:00
selinuxfs.c	selinuxfs: unify policy load error reporting	2021-03-18 23:26:59 -04:00
status.c	selinux: move status variables out of selinux_ss	2020-02-10 10:49:01 -05:00
xfrm.c	selinux: mark selinux_xfrm_refcount as __read_mostly	2021-01-12 10:12:58 -05:00