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
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	ethernet: natsemi: correct spelling	2018-03-06 11:14:08 -05:00
jazzsonic.c	natsemi: sonic: stop calling netdev_boot_setup_check	2021-08-03 13:05:25 +01:00
macsonic.c	net/sonic: Fix some resource leaks in error handling paths	2021-01-05 15:59:20 -08:00
natsemi.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
ns83820.c	drivers/net/ethernet: clean up mis-targeted comments	2020-09-25 16:29:00 -07:00
sonic.c	net: natsemi: Replace in_interrupt() usage.	2020-09-29 14:02:54 -07:00
sonic.h	net: natsemi: Replace in_interrupt() usage.	2020-09-29 14:02:54 -07:00
xtsonic.c	natsemi: sonic: stop calling netdev_boot_setup_check	2021-08-03 13:05:25 +01:00