David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -08:00
..
b53	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
microchip	net: dsa: microchip: enable module autoprobe	2020-02-07 18:45:12 +01:00
mv88e6xxx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-02-27 18:31:39 -08:00
ocelot	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
qca	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
sja1105	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
bcm_sf2_cfp.c	net: dsa: bcm_sf2: Fix IP fragment location and behavior	2019-12-24 16:08:49 -08:00
bcm_sf2_regs.h	Revert "net: dsa: bcm_sf2: Also configure Port 5 for 2Gb/sec on 7278"	2020-02-26 16:33:35 -08:00
bcm_sf2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-02-27 18:31:39 -08:00
bcm_sf2.h	net: dsa: bcm_sf2: Add support for optional reset controller line	2019-11-05 18:06:38 -08:00
dsa_loop_bdinfo.c
dsa_loop.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
dsa_loop.h
Kconfig	net: dsa: vsc73xx: Remove dependency on CONFIG_OF	2020-01-05 14:23:48 -08:00
lan9303_i2c.c
lan9303_mdio.c
lan9303-core.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
lan9303.h
lantiq_gswip.c	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
lantiq_pce.h	net: dsa: Use the correct style for SPDX License Identifier	2019-09-22 15:25:08 -07:00
Makefile	net: dsa: add support for Atheros AR9331 built-in switch	2019-12-20 17:05:47 -08:00
mt7530.c	net: dsa: propagate resolved link config via mac_link_up()	2020-02-27 12:02:14 -08:00
mt7530.h	net: dsa: mt7530: Add support for port 5	2019-09-05 00:28:23 +02:00
mv88e6060.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
mv88e6060.h
qca8k.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
qca8k.h
realtek-smi-core.c	net: dsa: remove dsa_switch_alloc helper	2019-10-22 12:37:07 -07:00
realtek-smi-core.h
rtl8366.c	net: dsa: rtl8366: Check VLAN ID and not ports	2019-10-02 12:09:23 -04:00
rtl8366rb.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
vitesse-vsc73xx-core.c	net: dsa: Get information about stacked DSA protocol	2020-01-08 16:01:13 -08:00
vitesse-vsc73xx-platform.c
vitesse-vsc73xx-spi.c
vitesse-vsc73xx.h