]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 18:41:19 +0000 (14:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 18:41:19 +0000 (14:41 -0400)
commit1657698e0b1cda510d0ff4dbd12e0c2d79e0252e
treefc89b580d76d0496fe0a3a60987a7cd5a265fdb9
parent79b7936b37f3538c0884e66ef89bc359018de4bf
parent906aef006332c135feaa572b3c5cdf337eb6cffe
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>