From: David S. Miller Date: Sun, 6 Dec 2015 16:14:06 +0000 (-0500) Subject: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b48565f50bf33e738e8660f26594b2feb2ad61cc;p=openwrt%2Fstaging%2Fblogic.git Merge branch '100GbE' of git://git./linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== 100GbE Intel Wired LAN Driver Updates 2015-12-05 This series contains updates to fm10k only. Jacob provides the remaining fm10k patches in the series. First change ensures that all the logic regarding the setting of netdev features is consolidated in one place of the driver. Fixed an issue where an assumption was being made on how many queues are available, especially when init_hw_vf() errors out. Fixed up an number of issues with init_hw() where failures were not being handled properly or at all, so update the driver to check returned error codes and respond appropriately. Fixed up typecasting issues found where either the incorrect typecast size was used or explicitly typecast values. Added additional debugging statistics and rename statistic to better reflect its true value. Added support for ITR scaling based on PCIe link speed for fm10k. Fixed up code comment where "hardware" was misspelled. v2: Dropped patches #1 and #10 from original submission, patch #1 was from Nick Krause and due to his past kernel interactions, dropping his patch. Patch #10 had questions and concerns from Tom Herbert which cannot be addressed at this time since the author (Jacob Keller) is currently on sabbatical, so dropping this patch for now until we can properly address Tom's questions and concerns. ==================== Signed-off-by: David S. Miller --- b48565f50bf33e738e8660f26594b2feb2ad61cc