diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-09 10:36:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-09 10:36:25 -0700 |
| commit | 5766cd68f6790de29c1e624008dc5ff0da111f9a (patch) | |
| tree | bde2b7ac6d317ce1087f2cda193386c7bb4da513 /arch/cris | |
| parent | 996b44fcef8f216ea0b6b6e74468c5a77b5e341f (diff) | |
| parent | 8e679021c5b9465ac5b0d7efd26baab9b10a2dbd (diff) | |
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2017-10-09
This series contains updates to ixgbe and arch/Kconfig.
Mark fixes a case where PHY register access is not supported and we were
returning a PHY address, when we should have been returning -EOPNOTSUPP.
Sabrina Dubroca fixes the use of a logical "and" when it should have been
the bitwise "and" operator.
Ding Tianhong reverts the commit that added the Kconfig bool option
ARCH_WANT_RELAX_ORDER, since there is now a new flag
PCI_DEV_FLAGS_NO_RELAXED_ORDERING that has been added to indicate that
Relaxed Ordering Attributes should not be used for Transaction Layer
Packets. Then follows up with making the needed changes to ixgbe to
use the new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag.
John Fastabend fixes an issue in the ring accounting when the transmit
ring parameters are changed via ethtool when an XDP program is attached.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions