Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
authorDavid S. Miller <davem@davemloft.net>
Fri, 19 Mar 2021 21:24:58 +0000 (14:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Mar 2021 21:24:58 +0000 (14:24 -0700)
commitd773b7957e4fd7b732a163df0e59d31ad4237302
tree5c77d07219b3f7c468ebe399b399cd4e8e7313c9
parent919067cc845f323a80b6fe987b64238bd82d309e
parentf2d75b178532087c15b2a86ec79e443177611b7a
Merge branch '1GbE' of git://git./linux/kernel/git/tnguy/next-queue

Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2021-03-19

This series contains updates to igc and e1000e drivers.

Sasha removes unused defines in igc driver.

Jiapeng Zhong changes bool assignments from 0/1 to false/true for igc.

Wei Yongjun marks e1000e_pm_prepare() as __maybe_unused to resolve a
defined but not used warning under certain configurations.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>