Jakub Kicinski 0ca8d3ca45 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Build failure in drivers/net/wwan/mhi_wwan_mbim.c: add missing parameter (0, assuming we don't want buffer pre-alloc). Conflict in drivers/net/dsa/sja1105/sja1105_main.c between: 589918df93 ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too") 0fac6aa098 ("net: dsa: sja1105: delete the best_effort_vlan_filtering mode") Follow the instructions from the commit message of the former commit - removed the if conditions. When looking at commit 589918df93 ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too") note that the mask_iotag fields get removed by the following patch. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-05 15:08:47 -07:00
..
include	mctp: Add MCTP base	2021-07-29 15:06:49 +01:00
ss	selinux: correct the return value when loads initial sids	2021-08-02 09:59:50 -04:00
.gitignore	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
avc.c	selinux: kill 'flags' argument in avc_has_perm_flags() and avc_audit()	2021-06-11 13:11:45 -04:00
hooks.c	mctp: Add MCTP base	2021-07-29 15:06:49 +01:00
ibpkey.c	selinux: remove unused global variables	2021-01-12 09:49:01 -05:00
ima.c	selinux: measure state and policy capabilities	2021-03-08 19:39:07 -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	selinux/stable-5.13 PR 20210426	2021-04-27 13:42:11 -07:00
status.c	selinux: move status variables out of selinux_ss	2020-02-10 10:49:01 -05:00
xfrm.c	selinux: delete selinux_xfrm_policy_lookup() useless argument	2021-05-10 21:38:31 -04:00