diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-16 16:16:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-16 16:16:24 -0700 |
| commit | c9f66b43ee27409e1b614434d87e0e722efaa5f2 (patch) | |
| tree | 1a1bfd44197512f0e9412cd5953e163ab1c61367 /include | |
| parent | ea12fe9dee97d1f284ee980845444859cfcb307d (diff) | |
| parent | 880e6269fd6e60249c8f5f1b98295e9f7e56636d (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions