Merge branch 'bnxt_en-updates'
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Jun 2016 23:16:18 +0000 (19:16 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Jun 2016 23:16:18 +0000 (19:16 -0400)
commitce9355acd5f45f8d53520e110053aa9d3fec59d1
tree6bca01a56738a089da6afbbb9bdbbd9d39e21279
parent7659f50c3c38f808af074dcb5b54247e0cc9989e
parent00c04a928572991d30b2473a7e992c1be8e646f3
Merge branch 'bnxt_en-updates'

Michael Chan says:

====================
bnxt_en: Updates for net-next.

-Add default VLAN support for VFs.
-Add NPAR (NIC partioning) support.
-Add support for new device 5731x and 5741x. GRO logic is different.
-Support new ETHTOOL_{G|S}LINKSETTINGS.
====================

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