From: David S. Miller Date: Thu, 8 Jun 2017 18:41:19 +0000 (-0400) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3948b57bd592c05bd6c08b3fea0862473cf9d5d9;p=linux.git Merge branch '1GbE' of git://git./linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== 1GbE Intel Wired LAN Driver Updates 2017-06-07 This series contains a fix for e1000e and igb. Colin Ian King fixes sparse warnings in igb by making functions static. Chris Wilson provides a fix for a previous commit which is causing an issue during suspend "e1000e_pm_suspend()", where we need to run e1000e_pm_thaw() if __e1000_shutdown() is unsuccessful. ==================== Signed-off-by: David S. Miller --- 3948b57bd592c05bd6c08b3fea0862473cf9d5d9