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

Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/ethernet/aurora/nb8800.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
index 657206be7ba99b20a31c839ad2a3a23fa966c300,5f44c5520fbc86bd9076cc220906e0a4cdee4e90..d54405b4610964967ca5055ab1495f8d1c1675d4
--- 1/drivers/net/ethernet/ibm/ibmvnic.c
--- 2/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@@ -3644,8 -3668,7 +3658,9 @@@ static void handle_crq_init_rsp(struct 
                goto task_failed;
  
        netdev->real_num_tx_queues = adapter->req_tx_queues;
+       netdev->mtu = adapter->req_mtu;
 +      netdev->min_mtu = adapter->min_mtu;
 +      netdev->max_mtu = adapter->max_mtu;
  
        if (adapter->failover) {
                adapter->failover = false;

diff --cc drivers/net/ethernet/intel/i40e/i40e.h
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
index 68675d83bdc56c83a17f95fa81263624e12c9e6a,bf5cc55ba24cbe9aeb44352462dccb254117abed..8302c7e660ce27151b4823c71fab9a97a51456c1
--- 1/drivers/net/ethernet/marvell/mv643xx_eth.c
--- 2/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@@ -3143,18 -3144,18 +3160,18 @@@ static int mv643xx_eth_probe(struct pla
  
        err = 0;
        if (pd->phy_node) {
 -              mp->phy = of_phy_connect(mp->dev, pd->phy_node,
 -                                       mv643xx_eth_adjust_link, 0,
 -                                       get_phy_mode(mp));
 -              if (!mp->phy)
 +              phydev = of_phy_connect(mp->dev, pd->phy_node,
 +                                      mv643xx_eth_adjust_link, 0,
-                                       PHY_INTERFACE_MODE_GMII);
++                                      get_phy_mode(mp));
 +              if (!phydev)
                        err = -ENODEV;
                else
 -                      phy_addr_set(mp, mp->phy->mdio.addr);
 +                      phy_addr_set(mp, phydev->mdio.addr);
        } else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
 -              mp->phy = phy_scan(mp, pd->phy_addr);
 +              phydev = phy_scan(mp, pd->phy_addr);
  
 -              if (IS_ERR(mp->phy))
 -                      err = PTR_ERR(mp->phy);
 +              if (IS_ERR(phydev))
 +                      err = PTR_ERR(phydev);
                else
                        phy_init(mp, pd->speed, pd->duplex);
        }
@@@ -3203,12 -3204,6 +3220,15 @@@
        dev->priv_flags |= IFF_UNICAST_FLT;
        dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
  
++<<<<<<< HEAD
 +      /* MTU range: 64 - 9500 */
 +      dev->min_mtu = 64;
 +      dev->max_mtu = 9500;
 +
 +      SET_NETDEV_DEV(dev, &pdev->dev);
 +
++=======
++>>>>>>> 2a26d99b251b8625d27aed14e97fc10707a3a81f
        if (mp->shared->win_protect)
                wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
  

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/qualcomm/emac/emac.c
Simple merge

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

diff --cc drivers/net/ethernet/rocker/rocker_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/synopsys/dwc_eth_qos.c
Simple merge

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

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

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

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

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

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

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc drivers/usb/gadget/function/u_ether.c
Simple merge

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

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

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

diff --cc include/net/mac80211.h
index b9b24abd9103c21c8d7fa3f78b2daf9a443040a0,e2dba93e374fda7f93c5dda34d28df8211e9eacc..5345d358a510ce63d5c13fd48cfd7f9284405768
--- 1/include/net/mac80211.h
--- 2/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@@ -1743,10 -1747,9 +1747,10 @@@ struct ieee80211_sta_rates 
   * @wme: indicates whether the STA supports QoS/WME (if local devices does,
   *    otherwise always false)
   * @drv_priv: data area for driver use, will always be aligned to
-  *    sizeof(void *), size is determined in hw information.
+  *    sizeof(void \*), size is determined in hw information.
   * @uapsd_queues: bitmap of queues configured for uapsd. Only valid
 - *    if wme is supported.
 + *    if wme is supported. The bits order is like in
 + *    IEEE80211_WMM_IE_STA_QOSINFO_AC_*.
   * @max_sp: max Service Period. Only valid if wme is supported.
   * @bandwidth: current bandwidth the station can receive with
   * @rx_nss: in HT/VHT, the maximum number of spatial streams the

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

diff --cc include/net/udp.h
index 18f1e6b9192711d9d5d92345adc86e716929b70a,4948790d393d7617edba64603c60974942289ee4..6134f37ba3ab8b7af9988114d82866a69f691f1e
--- 1/include/net/udp.h
--- 2/include/net/udp.h
+++ b/include/net/udp.h
@@@ -261,7 -258,7 +261,8 @@@ void udp_flush_pending_frames(struct so
  void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst);
  int udp_rcv(struct sk_buff *skb);
  int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 +int udp_init_sock(struct sock *sk);
+ int __udp_disconnect(struct sock *sk, int flags);
  int udp_disconnect(struct sock *sk, int flags);
  unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait);
  struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,

diff --cc net/8021q/vlan.c
Simple merge

diff --cc net/batman-adv/log.h
Simple merge

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

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

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

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

diff --cc net/ethernet/eth.c
Simple merge

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

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

diff --cc net/ipv4/tcp_ipv4.c
index 83b3d0b8c4812d734728360a694a596a17257d02,61b7be303eeca39f4c581f2ebef42639e672a036..b9b8282633d49f4f62fba8840605fd17f611804c
--- 1/net/ipv4/tcp_ipv4.c
--- 2/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -1909,9 -1907,8 +1907,8 @@@ get_sk
                        continue;
                if (sk->sk_family == st->family)
                        return sk;
-               icsk = inet_csk(sk);
        }
 -      spin_unlock_bh(&ilb->lock);
 +      spin_unlock(&ilb->lock);
        st->offset = 0;
        if (++st->bucket < INET_LHTABLE_SIZE)
                goto get_head;

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

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

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

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

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

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

diff --cc net/rds/rds.h
Simple merge

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

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

diff --cc net/switchdev/switchdev.c
Simple merge

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