mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-05-13 10:48:10 +00:00
70f3522614
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> |
||
|---|---|---|
| .. | ||
| ixgbe.h | ||
| ixgbe_82598.c | ||
| ixgbe_82599.c | ||
| ixgbe_common.c | ||
| ixgbe_common.h | ||
| ixgbe_dcb.c | ||
| ixgbe_dcb.h | ||
| ixgbe_dcb_82598.c | ||
| ixgbe_dcb_82598.h | ||
| ixgbe_dcb_82599.c | ||
| ixgbe_dcb_82599.h | ||
| ixgbe_dcb_nl.c | ||
| ixgbe_debugfs.c | ||
| ixgbe_ethtool.c | ||
| ixgbe_fcoe.c | ||
| ixgbe_fcoe.h | ||
| ixgbe_ipsec.c | ||
| ixgbe_ipsec.h | ||
| ixgbe_lib.c | ||
| ixgbe_main.c | ||
| ixgbe_mbx.c | ||
| ixgbe_mbx.h | ||
| ixgbe_model.h | ||
| ixgbe_phy.c | ||
| ixgbe_phy.h | ||
| ixgbe_ptp.c | ||
| ixgbe_sriov.c | ||
| ixgbe_sriov.h | ||
| ixgbe_sysfs.c | ||
| ixgbe_txrx_common.h | ||
| ixgbe_type.h | ||
| ixgbe_x540.c | ||
| ixgbe_x540.h | ||
| ixgbe_x550.c | ||
| ixgbe_xsk.c | ||
| Makefile | ||