Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...
commit2cc632dbc75d72f64bc3c966929c77306bd46a05
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 16:18:27 +0000 (17 12:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 16:18:27 +0000 (17 12:18 -0400)
tree1ee683926e173afbdef6b80309c5b1616a8f59a4
parentb1725423732dd7b58856adcc03cbf1145fcea491
parent5eee87cd51df8492d7e61c2d8b5154a15a4888b2
Merge branch '10GbE' of git://git./linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2016-05-16

This series contains 2 fixes to ixgbe only.

Emil fixes transmit hangs when enabling SRIOV by swapping the parameters
in GENMASK in order to generate the correct mask.

Alex fixes his previous patch b83e30104bd9 ("ixgbe/ixgbevf: Add support
for GSO partial") where he somehow transposed the location of setting
the VLAN features in netdev->features and the configuration of the
vlan_features.
====================

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