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	net: qrtr: Add MHI transport layer	2020-05-07 13:21:12 -07:00
mhi.c	net: really fix the build...	2021-08-03 11:14:03 +01:00
ns.c	net: qrtr: ns: Fix error return code in qrtr_ns_init()	2021-05-19 13:14:35 -07:00
qrtr.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
qrtr.h	net: qrtr: fix null-ptr-deref in qrtr_ns_remove	2021-01-05 16:50:09 -08:00
smd.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
tun.c	net: qrtr: Fix memory leak in qrtr_tun_open	2021-02-23 15:38:22 -08:00