From: David S. Miller Date: Tue, 1 Oct 2013 16:50:14 +0000 (-0400) Subject: Merge branch 'intel' X-Git-Tag: next-20131017~64^2~56 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=5229432f15e6f1b1e34e519e51d07917dee8790e Merge branch 'intel' Jeff Kirsher says: ==================== This series contains updates to ixgbevf, ixgbe and igb. Don provides 3 patches for ixgbevf where he cleans up a redundant read mailbox failure check, adds a new function to wait for receive queues to be disabled before disabling NAPI, and move the API negotiation so that it occurs in the reset path. This will allow the PF to be informed of the API version earlier. Jacob provides a ixgbevf and ixgbe patch. His ixgbevf patch removes the use of hw_dbg when the ixgbe_get_regs function is called in ethtool. The ixgbe patch renames the LL_EXTENDED_STATS and some of the functions required to implement busy polling in order to remove the marketing "low latency" blurb which hides what the code actually does. Leonardo provides a ixgbe patch to add support for DCB registers dump using ethtool for 82599 and x540 ethernet controllers. I (Jeff) provide a ixgbe patch to cleanup whitespace issues seen in a code review. Todd provides for igb to add support for i354 in the ethtool offline tests. Laura provides an igb patch to add the ethtool callbacks necessary to configure the number of RSS queues. ==================== Signed-off-by: David S. Miller --- 5229432f15e6f1b1e34e519e51d07917dee8790e