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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.h
Simple merge

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

diff --cc drivers/net/ethernet/cavium/thunder/nic_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 23211e08eecb870c784203e48fc83effc305c7b9,4a9873ec28c7119d28aabb791bd0628ceccf56ad..1598fb31477a194345f86d3895c599083a0d14db
--- 1/drivers/net/ethernet/intel/i40e/i40e_main.c
--- 2/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -10607,17 -10295,13 +10607,23 @@@ static int i40e_probe(struct pci_dev *p
        /* set up a default setting for link flow control */
        pf->hw.fc.requested_mode = I40E_FC_NONE;
  
+       /* set up the locks for the AQ, do this only once in probe
+        * and destroy them only once in remove
+        */
+       mutex_init(&hw->aq.asq_mutex);
+       mutex_init(&hw->aq.arq_mutex);
+ 
        err = i40e_init_adminq(hw);
 +      if (err) {
 +              if (err == I40E_ERR_FIRMWARE_API_VERSION)
 +                      dev_info(&pdev->dev,
 +                               "The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n");
 +              else
 +                      dev_info(&pdev->dev,
 +                               "The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n");
 +
 +              goto err_pf_reset;
 +      }
  
        /* provide nvm, fw, api versions */
        dev_info(&pdev->dev, "fw %d.%d.%05d api %d.%d nvm %s\n",

diff --cc drivers/net/ethernet/intel/i40evf/i40evf_main.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

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

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

diff --cc drivers/net/geneve.c
index 31b19fdf659d45d16ea5e7afb3836b86e70a1640,c2b79f5d1c89b6b5872c8197fde3eb2d806d4f36..e6e00924f8efcdae25c3282db8ba5eb494d9ba95
--- 1/drivers/net/geneve.c
--- 2/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@@ -1007,10 -966,7 +1007,8 @@@ static netdev_tx_t geneve6_xmit_skb(str
        }
        err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
                                   &fl6.saddr, &fl6.daddr, prio, ttl,
 -                                 sport, geneve->dst_port, !udp_csum);
 +                                 sport, geneve->dst_port,
 +                                 !!(flags & GENEVE_F_UDP_ZERO_CSUM6_TX));
- 
-       iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
        return NETDEV_TX_OK;
  
  tx_error:

diff --cc drivers/net/ppp/pppoe.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

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

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

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

diff --cc include/linux/cgroup-defs.h
Simple merge

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

diff --cc include/linux/netdevice.h
index 81b26a543a3cda9a97a5d1d8b6d8837f622d0320,3143c847bddbca47bed1a324bf85e58283e966a5..c20b814e46a072e83a821384154dd00534329350
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2127,26 -2084,8 +2127,26 @@@ struct pcpu_sw_netstats 
  })
  
  #define netdev_alloc_pcpu_stats(type)                                 \
-       __netdev_alloc_pcpu_stats(type, GFP_KERNEL);
+       __netdev_alloc_pcpu_stats(type, GFP_KERNEL)
  
 +enum netdev_lag_tx_type {
 +      NETDEV_LAG_TX_TYPE_UNKNOWN,
 +      NETDEV_LAG_TX_TYPE_RANDOM,
 +      NETDEV_LAG_TX_TYPE_BROADCAST,
 +      NETDEV_LAG_TX_TYPE_ROUNDROBIN,
 +      NETDEV_LAG_TX_TYPE_ACTIVEBACKUP,
 +      NETDEV_LAG_TX_TYPE_HASH,
 +};
 +
 +struct netdev_lag_upper_info {
 +      enum netdev_lag_tx_type tx_type;
 +};
 +
 +struct netdev_lag_lower_state_info {
 +      u8 link_up : 1,
 +         tx_enabled : 1;
 +};
 +
  #include <linux/notifier.h>
  
  /* netdevice notifier chain. Please remember to update the rtnetlink

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

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

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

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

diff --cc kernel/cgroup.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/mpls/af_mpls.c
index 4b3b9b310c3a00baba320d4071ea98d108a79d48,c32fc411a911a414db2d0c1e141cb76093079d33..b18c5ed42d956bd7d9261caa7dd05278f72e2785
--- 1/net/mpls/af_mpls.c
--- 2/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@@ -559,18 -542,12 +567,22 @@@ static int mpls_nh_assign_dev(struct ne
        if (!mpls_dev_get(dev))
                goto errout;
  
+       if ((nh->nh_via_table == NEIGH_LINK_TABLE) &&
+           (dev->addr_len != nh->nh_via_alen))
+               goto errout;
+ 
        RCU_INIT_POINTER(nh->nh_dev, dev);
  
 +      if (!(dev->flags & IFF_UP)) {
 +              nh->nh_flags |= RTNH_F_DEAD;
 +      } else {
 +              unsigned int flags;
 +
 +              flags = dev_get_flags(dev);
 +              if (!(flags & (IFF_RUNNING | IFF_LOWER_UP)))
 +                      nh->nh_flags |= RTNH_F_LINKDOWN;
 +      }
 +
        return 0;
  
  errout:
@@@ -715,11 -693,9 +731,8 @@@ static int mpls_nh_build_multi(struct m
                        nla_newdst = nla_find(attrs, attrlen, RTA_NEWDST);
                }
  
-               if (!nla_via)
-                       goto errout;
- 
                err = mpls_nh_build(cfg->rc_nlinfo.nl_net, rt, nh,
 -                                  rtnh->rtnh_ifindex, nla_via,
 -                                  nla_newdst);
 +                                  rtnh->rtnh_ifindex, nla_via, nla_newdst);
                if (err)
                        goto errout;
  

diff --cc net/mpls/mpls_iptunnel.c
Simple merge

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

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

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge