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
..
iosm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
Kconfig	net: wwan: Add MHI MBIM network driver	2021-08-04 10:10:12 +01:00
Makefile	net: wwan: Add MHI MBIM network driver	2021-08-04 10:10:12 +01:00
mhi_wwan_ctrl.c	net: really fix the build...	2021-08-03 11:14:03 +01:00
mhi_wwan_mbim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
rpmsg_wwan_ctrl.c	net: wwan: Allow WWAN drivers to provide blocking tx and poll function	2021-06-18 13:13:40 -07:00
wwan_core.c	wwan: core: Fix missing RTM_NEWLINK event for default link	2021-07-23 17:16:19 +01:00
wwan_hwsim.c	wwan: core: support default netdev creation	2021-06-22 10:01:16 -07:00