diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-08 14:41:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-08 14:41:19 -0400 |
| commit | 3948b57bd592c05bd6c08b3fea0862473cf9d5d9 (patch) | |
| tree | fc89b580d76d0496fe0a3a60987a7cd5a265fdb9 /include/linux/socket.h | |
| parent | cxgb4: fix to bring link down after adapter crash (diff) | |
| parent | e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails (diff) | |
| download | wireguard-linux-3948b57bd592c05bd6c08b3fea0862473cf9d5d9.tar.xz wireguard-linux-3948b57bd592c05bd6c08b3fea0862473cf9d5d9.zip | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'include/linux/socket.h')
0 files changed, 0 insertions, 0 deletions