From: David S. Miller <davem@davemloft.net>
Date: Wed, 29 Jun 2016 08:28:59 +0000 (-0400)
Subject: Merge branch 'mlx5-100G-fixes'
X-Git-Tag: v4.7-rc6~25^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f5074d0ce2f8;p=karo-tx-linux.git

Merge branch 'mlx5-100G-fixes'

Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes#2 for 4.7-rc

The following series provides one-liners fixes for mlx5 driver plus one
medium patch to reorganize ethtool counters reporting.

Highlights:
	- Added MODIFY_FLOW_TABLE to command strings table
	- Add ConnectX-5 PCIe 4.0 to list of supported devices
	- Rename ASYNC_EVENTS enum
	- Enable BlueFlame only when supported by device
	- Avoid adding same vxlan port twice
	- Report the correct number of PFC counters
	- Reorganize ethtool reported counters and remove duplications
====================

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

f5074d0ce2f8b45b3d5998a280edd2066c0cfcda