mirror of https://gitee.com/openkylin/linux.git
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> |
||
---|---|---|
.. | ||
auth.h | ||
checksum.h | ||
command.h | ||
constants.h | ||
sctp.h | ||
sm.h | ||
stream_interleave.h | ||
stream_sched.h | ||
structs.h | ||
tsnmap.h | ||
ulpevent.h | ||
ulpqueue.h |