]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 16:18:27 +0000 (12:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2016 16:18:27 +0000 (12:18 -0400)
commit66d03647a3f0c77effc3dc838a6d3aa54a9907c1
tree1ee683926e173afbdef6b80309c5b1616a8f59a4
parenta1dd09ac7f19efd62ee08edf11ea2ce20599f3a5
parenta95b1ce7d629b1f46cfde3125a8deb1828f4632f
Merge branch '10GbE' of git://git.kernel.org/pub/scm/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 397ad99678b6 ("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>