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
..
vxge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
Kconfig	docs: networking: reorganize driver documentation again	2020-06-26 16:08:44 -07:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
s2io-regs.h
s2io.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
s2io.h	net: neterion: s2io: Replace in_interrupt() for context detection	2020-10-31 09:55:16 -07:00