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

Mere overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
index 26954fd,948583f..081acf0
--- 1/drivers/net/ethernet/amazon/ena/ena_netdev.c
--- 2/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@@ -1861,8 -1237,9 +1861,8 @@@ static int ena_io_poll(struct napi_stru
  {
        struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);
        struct ena_ring *tx_ring, *rx_ring;
-       u32 tx_work_done;
-       u32 rx_work_done;
 -
+       int tx_work_done;
+       int rx_work_done = 0;
        int tx_budget;
        int napi_comp_call = 0;
        int ret;

diff --cc drivers/net/ethernet/atheros/ag71xx.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/cortina/gemini.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hip04_eth.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/main.h
Simple merge

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

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/common.h
index 09c7202,94f9468..31003b6
--- 1/drivers/net/ethernet/stmicro/stmmac/common.h
--- 2/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@@ -363,16 -363,10 +363,15 @@@ struct dma_features 
        unsigned int dvlan;
        unsigned int l3l4fnum;
        unsigned int arpoffsel;
 +      /* TSN Features */
 +      unsigned int estwid;
 +      unsigned int estdep;
 +      unsigned int estsel;
 +      unsigned int fpesel;
  };
  
- /* GMAC TX FIFO is 8K, Rx FIFO is 16K */
- #define BUF_SIZE_16KiB 16384
- /* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */
+ /* RX Buffer size must be multiple of 4/8/16 bytes */
+ #define BUF_SIZE_16KiB 16368
  #define BUF_SIZE_8KiB 8188
  #define BUF_SIZE_4KiB 4096
  #define BUF_SIZE_2KiB 2048

diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
Simple merge

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

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

diff --cc drivers/net/fjes/fjes_main.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/phy/phylink.c
index a917f95,1585eeb..ba9468c
--- 1/drivers/net/phy/phylink.c
--- 2/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -445,9 -441,8 +445,8 @@@ static void phylink_mac_link_up(struct 
        struct net_device *ndev = pl->netdev;
  
        pl->cur_interface = link_state.interface;
 -      pl->ops->mac_link_up(pl->config, pl->link_an_mode,
 +      pl->ops->mac_link_up(pl->config, pl->cur_link_an_mode,
-                            pl->phy_state.interface,
-                            pl->phydev);
+                            pl->cur_interface, pl->phydev);
  
        if (ndev)
                netif_carrier_on(ndev);

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

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

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc drivers/s390/net/qeth_core_mpc.h
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/phy.h
Simple merge

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

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

diff --cc net/sctp/stream.c
Simple merge

diff --cc net/smc/smc_core.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/tipc/bcast.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport_common.c
Simple merge