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

udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/ethernet/marvell/mvneta.c
index 87274d4ab10217cac3fc17bb38548cbf43a9e803,0c0a45af950f0978ee352195a3a27a6439b56d7e..0a24571e44b925622afdf586e48f98e06ba31a5d
--- 1/drivers/net/ethernet/marvell/mvneta.c
--- 2/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@@ -4131,14 -4151,9 +4131,14 @@@ static int mvneta_probe(struct platform
        dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
        dev->hw_features |= dev->features;
        dev->vlan_features |= dev->features;
-       dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
+       dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
        dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
  
 +      /* MTU range: 68 - 9676 */
 +      dev->min_mtu = ETH_MIN_MTU;
 +      /* 9676 == 9700 - 20 and rounding to 8 */
 +      dev->max_mtu = 9676;
 +
        err = register_netdev(dev);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to register\n");

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

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 9018bb1b2e12142e048281a9d28ddf95e0023a61,a60f635da78b7d1bf16f6c0f05d66c8be824a7dc..c48ce3f366c378104c2b14da7376e3295093fcfb
--- 1/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
--- 2/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@@ -2246,11 -2198,10 +2248,12 @@@ void mlx4_en_destroy_netdev(struct net_
  #endif
  
        mlx4_en_free_resources(priv);
+       mutex_unlock(&mdev->state_lock);
  
 -      kfree(priv->tx_ring);
 -      kfree(priv->tx_cq);
 +      for (t = 0; t < MLX4_EN_NUM_TX_TYPES; t++) {
 +              kfree(priv->tx_ring[t]);
 +              kfree(priv->tx_cq[t]);
 +      }
  
        if (!shutdown)
                free_netdev(dev);

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

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

diff --cc drivers/net/ieee802154/adf7242.c
Simple merge

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

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

diff --cc init/Kconfig
Simple merge

diff --cc net/core/ethtool.c
index 0adb3bec5b5a542a77c17d9bbaaa2d8327f36919,047a1752ece183b2b2affa5bd0e7a08886530b1d..e23766c7e3ba19414494d242af86c1029e8eee61
--- 1/net/core/ethtool.c
--- 2/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@@ -2569,7 -2479,7 +2569,8 @@@ int dev_ethtool(struct net *net, struc
        case ETHTOOL_GET_TS_INFO:
        case ETHTOOL_GEEE:
        case ETHTOOL_GTUNABLE:
 +      case ETHTOOL_PHY_GTUNABLE:
+       case ETHTOOL_GLINKSETTINGS:
                break;
        default:
                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

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

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

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

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

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

diff --cc net/l2tp/l2tp_eth.c
Simple merge

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