From: David S. Miller Date: Fri, 19 Mar 2021 20:49:25 +0000 (-0700) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue X-Git-Tag: microblaze-v5.14~349^2~19 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3c16e398bad3245352a3fdb0b16e31174dd84c37;p=linux-2.6-microblaze.git Merge branch '1GbE' of git://git./linux/kernel/git/tnguy/net-queue Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2021-03-19 This series contains updates to e1000e and igb drivers. Tom Seewald fixes duplicate guard issues by including the driver name in the guard for e1000e and igb. Jesse adds checks that timestamping is on and valid to avoid possible issues with a misinterpreted time stamp for igb. ==================== Signed-off-by: David S. Miller --- 3c16e398bad3245352a3fdb0b16e31174dd84c37