mirror of
https://github.com/torvalds/linux
synced 2024-10-03 18:00:50 +00:00
b4b12b0d2f
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>
|
||
|---|---|---|
| .. | ||
| dpaa | ||
| dpaa2 | ||
| enetc | ||
| fman | ||
| fs_enet | ||
| fec.h | ||
| fec_main.c | ||
| fec_mpc52xx.c | ||
| fec_mpc52xx.h | ||
| fec_mpc52xx_phy.c | ||
| fec_ptp.c | ||
| fsl_pq_mdio.c | ||
| gianfar.c | ||
| gianfar.h | ||
| gianfar_ethtool.c | ||
| Kconfig | ||
| Makefile | ||
| ucc_geth.c | ||
| ucc_geth.h | ||
| ucc_geth_ethtool.c | ||
| xgmac_mdio.c | ||