From: David S. Miller Date: Fri, 12 Mar 2021 00:15:42 +0000 (-0800) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ce6c13e4f5b9d26e77f8ffcf9cf8e904d7658d9b;p=linux.git Merge branch '1GbE' of git://git./linux/kernel/git/tnguy/net-queue Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2021-03-11 This series contains updates to igc and e1000e drivers. Sasha adds locking to reset task to prevent race condition for igc. Muhammad fixes reporting of supported pause frame as well as advertised pause frame for Tx/Rx off for igc. Andre fixes timestamp retrieval from the wrong timer for igc. Vitaly adds locking to reset task to prevent race condition for e1000e. Dinghao Liu adds a missed check to return on error in e1000_set_d0_lplu_state_82571. ==================== Signed-off-by: David S. Miller --- ce6c13e4f5b9d26e77f8ffcf9cf8e904d7658d9b