From: David S. Miller Date: Tue, 16 Jun 2020 23:16:24 +0000 (-0700) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: v5.15~3550^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9f66b43ee27409e1b614434d87e0e722efaa5f2;p=platform%2Fkernel%2Flinux-starfive.git Merge branch '1GbE' of git://git./linux/kernel/git/jkirsher/net-queue Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2020-06-16 This series contains fixes to e1000 and e1000e. Chen fixes an e1000e issue where systems could be waken via WoL, even though the user has disabled the wakeup bit via sysfs. Vaibhav Gupta updates the e1000 driver to clean up the legacy Power Management hooks. Arnd Bergmann cleans up the inconsistent use CONFIG_PM_SLEEP preprocessor tags, which also resolves the compiler warnings about the possibility of unused structure. ==================== Signed-off-by: David S. Miller --- c9f66b43ee27409e1b614434d87e0e722efaa5f2