From: David S. Miller <davem@davemloft.net>
Date: Sun, 27 Nov 2016 04:42:21 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./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>
---

0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe
diff --cc drivers/net/ethernet/marvell/mvneta.c
index 87274d4ab102,0c0a45af950f..0a24571e44b9
--- a/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/mellanox/mlx4/en_netdev.c
index 9018bb1b2e12,a60f635da78b..c48ce3f366c3
--- a/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 net/core/ethtool.c
index 0adb3bec5b5a,047a1752ece1..e23766c7e3ba
--- a/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))