From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Jun 2015 09:58:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~163^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a07bd6fead4f00f67b1bf5f551e686661c4f52c;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

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

3a07bd6fead4f00f67b1bf5f551e686661c4f52c
diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
index 4e69cf52a579,68b5a5563af7..33e68b11a158
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@@ -479,7 -479,15 +479,15 @@@ static int mlx4_dev_cap(struct mlx4_de
  		}
  	}
  
+ 	if (mlx4_is_master(dev) && (dev->caps.num_ports == 2) &&
+ 	    (port_type_array[0] == MLX4_PORT_TYPE_IB) &&
+ 	    (port_type_array[1] == MLX4_PORT_TYPE_ETH)) {
+ 		mlx4_warn(dev,
+ 			  "Granular QoS per VF not supported with IB/Eth configuration\n");
+ 		dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_QOS_VPP;
+ 	}
+ 
 -	dev->caps.max_counters = 1 << ilog2(dev_cap->max_counters);
 +	dev->caps.max_counters = dev_cap->max_counters;
  
  	dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW] = dev_cap->reserved_qps;
  	dev->caps.reserved_qps_cnt[MLX4_QP_REGION_ETH_ADDR] =
Reading git-diff-tree failed