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

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mr.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/main.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 8e70fa9ef39a331238dede59bccb4d02ff3af12f,500d817d2b0aea193dfc5523fc869a1f32882c90..d8f68e4d1018f3bda079ef2dd19a82fc85621792
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@@ -877,10 -883,9 +883,10 @@@ static void mlx5e_build_rep_params(stru
                                         MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
                                         MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
  
-       params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
 +      params->hard_mtu    = MLX5E_ETH_HARD_MTU;
+       params->log_sq_size = MLX5E_REP_PARAMS_LOG_SQ_SIZE;
        params->rq_wq_type  = MLX5_WQ_TYPE_LINKED_LIST;
-       params->log_rq_mtu_frames = MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE;
 -      params->log_rq_size = MLX5E_REP_PARAMS_LOG_RQ_SIZE;
++      params->log_rq_mtu_frames = MLX5E_REP_PARAMS_LOG_RQ_SIZE;
  
        params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
        mlx5e_set_rx_cq_mode_params(params, cq_period_mode);

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

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

diff --cc drivers/net/ethernet/netronome/nfp/bpf/jit.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
index 630409e0337fbaf7b98bb23e578c85b2aceae30b,b4779acb6b5c1f64b54f296a9727099e22f0ca4e..604ae78381ae4fdd28836e3cdca589da450c73a9
--- 1/drivers/net/ethernet/realtek/r8169.c
--- 2/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -8382,12 -8666,9 +8384,10 @@@ static int rtl_init_one(struct pci_dev 
        if (rc < 0)
                return rc;
  
-       pci_set_drvdata(pdev, dev);
- 
        netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
 -                 rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,
 -                 (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);
 +                 rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr,
 +                 (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff),
 +                 pci_irq_vector(pdev, 0));
        if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {
                netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, "
                           "tx checksumming: %s]\n",

diff --cc drivers/net/hyperv/rndis_filter.c
Simple merge

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

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

diff --cc drivers/scsi/iscsi_tcp.c
Simple merge

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

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

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/batman-adv/gateway_client.c
Simple merge

diff --cc net/batman-adv/multicast.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
index 5fcb17cb426bfcce40add19bdf664aec66775b1e,a7fd1c5a2a14935ef0b40f781b248f90de294cf0..de6d94482fe7ef6be52eeea3291849cfb9d961f9
--- 1/net/ipv4/ip_tunnel.c
--- 2/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@@ -346,8 -362,11 +346,10 @@@ static struct ip_tunnel *ip_tunnel_crea
        struct ip_tunnel *nt;
        struct net_device *dev;
        int t_hlen;
+       int mtu;
+       int err;
  
 -      BUG_ON(!itn->fb_tunnel_dev);
 -      dev = __ip_tunnel_create(net, itn->fb_tunnel_dev->rtnl_link_ops, parms);
 +      dev = __ip_tunnel_create(net, itn->rtnl_link_ops, parms);
        if (IS_ERR(dev))
                return ERR_CAST(dev);
  

diff --cc net/ipv4/netfilter/Makefile
Simple merge

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

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/ip6_vti.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

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

diff --cc net/xfrm/xfrm_input.c
Simple merge