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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/renesas/ravb_main.c
index 331c5969dca418de78a8cc0ec702fe711cb08705,744d7806a9eec63e1c4fb18cc7b57fa96d73fcbc..88656ceb6e2946662b63fd0a6120ce0777d88a18
--- 1/drivers/net/ethernet/renesas/ravb_main.c
--- 2/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@@ -1790,18 -1808,16 +1794,14 @@@ static int ravb_probe(struct platform_d
  
        /* Set AVB config mode */
        if (chip_id == RCAR_GEN2) {
 -              ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) |
 -                         CCC_OPC_CONFIG, CCC);
 +              ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG);
                /* Set CSEL value */
 -              ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) |
 -                         CCC_CSEL_HPB, CCC);
 +              ravb_modify(ndev, CCC, CCC_CSEL, CCC_CSEL_HPB);
        } else {
 -              ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) |
 -                         CCC_OPC_CONFIG | CCC_GAC | CCC_CSEL_HPB, CCC);
 +              ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG |
 +                          CCC_GAC | CCC_CSEL_HPB);
        }
  
-       /* Set CSEL value */
-       ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) | CCC_CSEL_HPB,
-                  CCC);
- 
        /* Set GTI value */
        error = ravb_set_gti(ndev);
        if (error)

diff --cc drivers/net/ethernet/ti/netcp_core.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/phy/bcm7xxx.c
index 9b311041ebfb5e30d34dcc213f3f6e8ff875bc54,db507e3bcab92d65143c170c1338af5ff60b11c5..b881a7b1e4f6dbc9cbbcbdac2ed16a3a6ace4fa5
--- 1/drivers/net/phy/bcm7xxx.c
--- 2/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@@ -247,13 -247,9 +247,9 @@@ static int bcm7xxx_config_init(struct p
        int ret;
  
        /* Enable 64 clock MDIO */
 -      phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO);
 +      phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XXX_64CLK_MDIO);
        phy_read(phydev, MII_BCM7XXX_AUX_MODE);
  
-       /* Workaround only required for 100Mbits/sec capable PHYs */
-       if (phydev->supported & PHY_GBIT_FEATURES)
-               return 0;
- 
        /* set shadow mode 2 */
        ret = phy_set_clr_bits(phydev, MII_BCM7XXX_TEST,
                        MII_BCM7XXX_SHD_MODE_2, MII_BCM7XXX_SHD_MODE_2);
@@@ -348,34 -324,43 +339,10 @@@ static struct phy_driver bcm7xxx_driver
        BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
        BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),
        BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
 -{
 -      .phy_id         = PHY_ID_BCM7425,
 -      .phy_id_mask    = 0xfffffff0,
 -      .name           = "Broadcom BCM7425",
 -      .features       = PHY_BASIC_FEATURES |
 -                        SUPPORTED_Pause | SUPPORTED_Asym_Pause,
 -      .flags          = PHY_IS_INTERNAL,
 -      .config_init    = bcm7xxx_config_init,
 -      .config_aneg    = genphy_config_aneg,
 -      .read_status    = genphy_read_status,
 -      .suspend        = bcm7xxx_suspend,
 -      .resume         = bcm7xxx_config_init,
 -}, {
 -      .phy_id         = PHY_ID_BCM7429,
 -      .phy_id_mask    = 0xfffffff0,
 -      .name           = "Broadcom BCM7429",
 -      .features       = PHY_BASIC_FEATURES |
 -                        SUPPORTED_Pause | SUPPORTED_Asym_Pause,
 -      .flags          = PHY_IS_INTERNAL,
 -      .config_init    = bcm7xxx_config_init,
 -      .config_aneg    = genphy_config_aneg,
 -      .read_status    = genphy_read_status,
 -      .suspend        = bcm7xxx_suspend,
 -      .resume         = bcm7xxx_config_init,
 -}, {
 -      .phy_id         = PHY_ID_BCM7435,
 -      .phy_id_mask    = 0xfffffff0,
 -      .name           = "Broadcom BCM7435",
 -      .features       = PHY_BASIC_FEATURES |
 -                        SUPPORTED_Pause | SUPPORTED_Asym_Pause,
 -      .flags          = PHY_IS_INTERNAL,
 -      .config_init    = bcm7xxx_config_init,
 -      .config_aneg    = genphy_config_aneg,
 -      .read_status    = genphy_read_status,
 -      .suspend        = bcm7xxx_suspend,
 -      .resume         = bcm7xxx_config_init,
 -} };
 +      BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),
 +      BCM7XXX_40NM_EPHY(PHY_ID_BCM7429, "Broadcom BCM7429"),
 +      BCM7XXX_40NM_EPHY(PHY_ID_BCM7435, "Broadcom BCM7435"),
- {
-       .phy_id         = PHY_BCM_OUI_4,
-       .phy_id_mask    = 0xffff0000,
-       .name           = "Broadcom BCM7XXX 40nm",
-       .features       = PHY_GBIT_FEATURES |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_IS_INTERNAL,
-       .config_init    = bcm7xxx_config_init,
-       .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .suspend        = bcm7xxx_suspend,
-       .resume         = bcm7xxx_config_init,
- }, {
-       .phy_id         = PHY_BCM_OUI_5,
-       .phy_id_mask    = 0xffffff00,
-       .name           = "Broadcom BCM7XXX 65nm",
-       .features       = PHY_BASIC_FEATURES |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_IS_INTERNAL,
-       .config_init    = bcm7xxx_dummy_config_init,
-       .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .suspend        = bcm7xxx_suspend,
-       .resume         = bcm7xxx_config_init,
- } };
++};
  
  static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
        { PHY_ID_BCM7250, 0xfffffff0, },

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

diff --cc drivers/net/vxlan.c
index 2ddc642fb64f9d6e316d0aaa3673efc4d52b9ed4,e6944b29588e1bd329c5b331988373d5297c0bd6..909f7931c297adb73e794c5e5d660f96d16dd11f
--- 1/drivers/net/vxlan.c
--- 2/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@@ -2342,6 -2397,40 +2349,15 @@@ static int __vxlan_change_mtu(struct ne
        return 0;
  }
  
 -static int egress_ipv4_tun_info(struct net_device *dev, struct sk_buff *skb,
 -                              struct ip_tunnel_info *info,
 -                              __be16 sport, __be16 dport)
 -{
 -      struct vxlan_dev *vxlan = netdev_priv(dev);
 -      struct rtable *rt;
 -      struct flowi4 fl4;
 -
 -      memset(&fl4, 0, sizeof(fl4));
 -      fl4.flowi4_tos = RT_TOS(info->key.tos);
 -      fl4.flowi4_mark = skb->mark;
 -      fl4.flowi4_proto = IPPROTO_UDP;
 -      fl4.daddr = info->key.u.ipv4.dst;
 -
 -      rt = ip_route_output_key(vxlan->net, &fl4);
 -      if (IS_ERR(rt))
 -              return PTR_ERR(rt);
 -      ip_rt_put(rt);
 -
 -      info->key.u.ipv4.src = fl4.saddr;
 -      info->key.tp_src = sport;
 -      info->key.tp_dst = dport;
 -      return 0;
 -}
 -
+ static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
+ {
+       struct vxlan_dev *vxlan = netdev_priv(dev);
+       struct vxlan_rdst *dst = &vxlan->default_dst;
+       struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
+                                                        dst->remote_ifindex);
+       return __vxlan_change_mtu(dev, lowerdev, dst, new_mtu, true);
+ }
+ 
  static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
  {
        struct vxlan_dev *vxlan = netdev_priv(dev);

diff --cc drivers/net/wireless/intel/iwlwifi/Kconfig
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/internal.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

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

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

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

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

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

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

diff --cc net/batman-adv/hard-interface.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/ipv4/udp.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/netfilter/nfnetlink.c
Simple merge

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

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

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

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

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