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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ocelot_ana.h | ||
ocelot_board.c | ||
ocelot_dev.h | ||
ocelot_io.c | ||
ocelot_police.c | ||
ocelot_police.h | ||
ocelot_qs.h | ||
ocelot_qsys.h | ||
ocelot_regs.c | ||
ocelot_rew.h | ||
ocelot_sys.h | ||
ocelot_tc.c | ||
ocelot_tc.h | ||
ocelot.c | ||
ocelot.h |