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

Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/amd/declance.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.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_tc.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index d05e37fcc1b25b399bad070d8e25590d024e1d97,c6d29fdbb880f1964847e674dc512d2f0311f0b7..24c8f5bb1eb4e187e0f757d0572dfd929865c0a1
--- 1/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
--- 2/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@@ -2091,14 -2094,18 +2094,18 @@@ static void nfp_ctrl_poll(unsigned lon
  {
        struct nfp_net_r_vector *r_vec = (void *)arg;
  
 -      spin_lock_bh(&r_vec->lock);
 +      spin_lock(&r_vec->lock);
        nfp_net_tx_complete(r_vec->tx_ring, 0);
        __nfp_ctrl_tx_queued(r_vec);
 -      spin_unlock_bh(&r_vec->lock);
 +      spin_unlock(&r_vec->lock);
  
-       nfp_ctrl_rx(r_vec);
- 
-       nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry);
+       if (nfp_ctrl_rx(r_vec)) {
+               nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry);
+       } else {
+               tasklet_schedule(&r_vec->tasklet);
+               nn_dp_warn(&r_vec->nfp_net->dp,
+                          "control message budget exceeded!\n");
+       }
  }
  
  /* Setup and Configuration

diff --cc drivers/net/ethernet/qlogic/qed/qed_hsi.h
Simple merge

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

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

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

diff --cc drivers/net/tun.c
index 3eb88b7147f07b88743a67a1726cb0647b0bf99b,50e9cc19023a701bad861ac117665a024ba776b1..b1743420939b48b4259c84144249ab52efcc5b8c
--- 1/drivers/net/tun.c
--- 2/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@@ -865,12 -867,9 +866,12 @@@ static int tun_attach(struct tun_struc
                tun_enable_queue(tfile);
        } else {
                sock_hold(&tfile->sk);
-               tun_napi_init(tun, tfile, napi);
+               tun_napi_init(tun, tfile, napi, napi_frags);
        }
  
 +      if (rtnl_dereference(tun->xdp_prog))
 +              sock_set_flag(&tfile->sk, SOCK_XDP);
 +
        tun_set_real_num_queues(tun);
  
        /* device is allowed to go away first, so no need to hold extra

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

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

diff --cc drivers/net/wireless/broadcom/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/1000.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/xen-netback/interface.c
index 7e3ea39a1b39fc5d4dedfd4e1ad0ffb349a6c6cf,f6ae23fc3f6b086e60149befd9a3ca9500a48bf1..182d6770f1027120b5cd7165e4b7eea7c8297299
--- 1/drivers/net/xen-netback/interface.c
--- 2/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@@ -162,11 -162,11 +162,12 @@@ static u16 xenvif_select_queue(struct n
        if (size == 0)
                return skb_get_hash_raw(skb) % dev->real_num_tx_queues;
  
-       return vif->hash.mapping[skb_get_hash_raw(skb) % size];
+       return vif->hash.mapping[vif->hash.mapping_sel]
+                               [skb_get_hash_raw(skb) % size];
  }
  
 -static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
 +static netdev_tx_t
 +xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        struct xenvif *vif = netdev_priv(dev);
        struct xenvif_queue *queue = NULL;

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

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

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

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

diff --cc net/bluetooth/smp.c
Simple merge

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

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

diff --cc net/core/rtnetlink.c
index 35162e1b06adcd8314c1080318cb8932caf1c972,448703312fed0f736bc7f0d58e7bda705a2344f2..57bf96d73e3b70559964a83b866f8c5780543a9d
--- 1/net/core/rtnetlink.c
--- 2/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@@ -1910,13 -1895,11 +1910,11 @@@ static int rtnl_dump_ifinfo(struct sk_b
  
        if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX,
                        ifla_policy, NULL) >= 0) {
 -              if (tb[IFLA_IF_NETNSID]) {
 -                      netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);
 -                      tgt_net = get_target_net(skb->sk, netnsid);
 +              if (tb[IFLA_TARGET_NETNSID]) {
 +                      netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);
 +                      tgt_net = rtnl_get_net_ns_capable(skb->sk, netnsid);
-                       if (IS_ERR(tgt_net)) {
-                               tgt_net = net;
-                               netnsid = -1;
-                       }
+                       if (IS_ERR(tgt_net))
+                               return PTR_ERR(tgt_net);
                }
  
                if (tb[IFLA_EXT_MASK])

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

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

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

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

diff --cc net/rxrpc/input.c
Simple merge

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

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

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

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

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

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