linux_dsm_epyc7002/Documentation/networking/dsa
David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.

The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.

However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-24 12:06:19 -08:00
..
bcm_sf2.txt Doc: networking: Fix typo in dsa 2016-04-13 22:38:56 -04:00
dsa.txt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-02-24 12:06:19 -08:00
lan9303.txt net: dsa: lan9303: Documentation: Add missing word "Mbps" 2017-11-13 09:59:29 +09:00