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
..
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
vxge-config.c	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
vxge-config.h	net: vxge: Remove in_interrupt() conditionals	2020-09-29 14:02:54 -07:00
vxge-ethtool.c	drivers/net/ethernet: clean up mis-targeted comments	2020-09-25 16:29:00 -07:00
vxge-ethtool.h	vxge: Add const to ethtool_driver_stats_keys	2015-04-01 15:35:14 -04:00
vxge-main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
vxge-main.h	vxge: avoid -Wemtpy-body warnings	2021-04-22 13:27:36 -07:00
vxge-reg.h
vxge-traffic.c	drivers/net/ethernet: clean up mis-targeted comments	2020-09-25 16:29:00 -07:00
vxge-traffic.h
vxge-version.h