From: David S. Miller Date: Fri, 6 Dec 2013 19:48:48 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19e1190afb6142d375c46991e3830bfbcb2c7315;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e only. Christopher Pau provides a patch to set pf_id based on device and function numbers since NICs with ARI enabled can have function numbers larger than 8. Anjali provides 3 i40e patches to update hardware defines to keep in sync with hardware updates. Shannon provides the majority of i40e patches, with 7. First patch clears the admin queue head and tail registers during admin queue shutdown. Then simplifies the admin queue head-tail-len setups to use more virtual registers. Provides several patches to cleanup and fix driver load and reset procedures to make more robust. Lastly, provides an ethtool test for interrupts using the software interrupt. Mitch provides some i40e patches which fixes up VF code in the PF driver, specifically the number of vectors per VF are reported by the hardware does not include vector 0, so we need to account for this when checking. In addition, cleans up debugging messages. Kamil provides an i40e patch to fix the diagnostics test by restricting the diagnostic test length. ==================== Signed-off-by: David S. Miller --- 19e1190afb6142d375c46991e3830bfbcb2c7315