linux-stable/drivers/net/dsa
David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-09 16:28:45 -07:00
..
b53 net: dsa: Move FDB dump implementation inside DSA 2017-08-07 14:48:48 -07:00
microchip net: dsa: Move FDB dump implementation inside DSA 2017-08-07 14:48:48 -07:00
mv88e6xxx net: dsa: Move FDB dump implementation inside DSA 2017-08-07 14:48:48 -07:00
bcm_sf2.c net: dsa: Remove support for vlan dump from DSA's drivers 2017-08-07 14:48:48 -07:00
bcm_sf2.h net: dsa: bcm_sf2: Add support for ethtool::rxnfc 2017-01-30 14:49:58 -05:00
bcm_sf2_cfp.c net: break include loop netdevice.h, dsa.h, devlink.h 2017-03-28 22:46:04 -07:00
bcm_sf2_regs.h net: dsa: bcm_sf2: Add CFP registers definitions 2017-01-30 14:49:58 -05:00
dsa_loop.c net: dsa: Remove support for vlan dump from DSA's drivers 2017-08-07 14:48:48 -07:00
dsa_loop.h net: dsa: Mock-up driver 2017-04-01 12:39:32 -07:00
dsa_loop_bdinfo.c net: dsa: Mock-up driver 2017-04-01 12:39:32 -07:00
Kconfig dsa: add DSA switch driver for Microchip KSZ9477 2017-05-31 20:56:31 -04:00
lan9303-core.c net: dsa: lan9303: Only allocate 3 ports 2017-08-08 18:13:59 -07:00
lan9303.h net: dsa: lan9303: MDIO access phy registers directly 2017-07-30 19:23:29 -07:00
lan9303_i2c.c net: dsa: lan9303: MDIO access phy registers directly 2017-07-30 19:23:29 -07:00
lan9303_mdio.c net: dsa: lan9303: MDIO access phy registers directly 2017-07-30 19:23:29 -07:00
Makefile dsa: add DSA switch driver for Microchip KSZ9477 2017-05-31 20:56:31 -04:00
mt7530.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-08-09 16:28:45 -07:00
mt7530.h net: dsa: mediatek: add adjust link support for user ports 2017-08-08 18:01:25 -07:00
mv88e6060.c net: dsa: store CPU port pointer in the tree 2017-05-17 14:19:12 -04:00
mv88e6060.h net: dsa: Keep the mii bus and address in the private structure 2016-04-13 18:15:23 -04:00
qca8k.c net: dsa: Move FDB dump implementation inside DSA 2017-08-07 14:48:48 -07:00
qca8k.h net: dsa: call phy_init_eee in DSA layer 2017-08-01 20:09:10 -07:00