Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cirrus/ep93xx_eth.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
index ecaa7a9,12aef1b..38160c2
--- 1/drivers/net/ethernet/freescale/fec_main.c
--- 2/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -2352,8 -2357,24 +2354,14 @@@ static int fec_enet_get_sset_count(stru
                return -EOPNOTSUPP;
        }
  }
+ 
+ #else /* !defined(CONFIG_M5272) */
+ #define FEC_STATS_SIZE        0
+ static inline void fec_enet_update_ethtool_stats(struct net_device *dev)
+ {
+ }
  #endif /* !defined(CONFIG_M5272) */
  
 -static int fec_enet_nway_reset(struct net_device *dev)
 -{
 -      struct phy_device *phydev = dev->phydev;
 -
 -      if (!phydev)
 -              return -ENODEV;
 -
 -      return genphy_restart_aneg(phydev);
 -}
 -
  /* ITR clock source is enet system clock (clk_ahb).
   * TCTT unit is cycle_ns * 64 cycle
   * So, the ICTT value = X us / (cycle_ns * 64)

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_ll2.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/usb/lan78xx.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc net/batman-adv/translation-table.c
Simple merge

diff --cc net/bridge/br_sysfs_br.c
Simple merge

diff --cc net/ipv4/fib_trie.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge