David S. Miller b4b12b0d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The phylink conflict was between a bug fix by Russell King to make sure we have a consistent PHY interface mode, and a change in net-next to pull some code in phylink_resolve() into the helper functions phylink_mac_link_{up,down}() On the dp83867 side it's mostly overlapping changes, with the 'net' side removing a condition that was supposed to trigger for RGMII but because of how it was coded never actually could trigger. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-31 10:49:43 -07:00
..
dsa.c
dsa2.c	net: dsa: Add error path handling in dsa_tree_setup()	2019-05-30 14:58:31 -07:00
dsa_priv.h	net: dsa: Move the phylink driver calls into port.c	2019-05-29 21:48:53 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile
master.c
port.c	net: dsa: Use PHYLINK for the CPU/DSA ports	2019-05-29 21:48:53 -07:00
slave.c	net: dsa: Move the phylink driver calls into port.c	2019-05-29 21:48:53 -07:00
switch.c
tag_8021q.c	net: dsa: tag_8021q: Create a stable binary format	2019-05-30 14:47:14 -07:00
tag_brcm.c
tag_dsa.c
tag_edsa.c
tag_gswip.c
tag_ksz.c
tag_lan9303.c
tag_mtk.c
tag_qca.c
tag_sja1105.c
tag_trailer.c