Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
authorJakub Kicinski <kuba@kernel.org>
Sat, 20 May 2023 04:52:18 +0000 (21:52 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 20 May 2023 04:52:18 +0000 (21:52 -0700)
commitdcbe4ea1985d3123836794be021c39cb33954f9f
tree2e9ff46282cee8f99a41e39b1778b5f1e7560944
parent20d5e0ef252a151ea6585cfccf32def81a624666
parentc4dc8dc32bd1fa0ed04d25f2e4004d854c163c39
Merge branch '1GbE' of git://git./linux/kernel/git/tnguy/next-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-05-18 (igc, igb, e1000e)

This series contains updates to igc, igb, and e1000e drivers.

Kurt Kanzenbach adds calls to txq_trans_cond_update() for XDP transmit
on igc.

Tom Rix makes definition of igb_pm_ops conditional on CONFIG_PM for igb.

Baozhu Ni adds a missing kdoc description on e1000e.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  e1000e: Add @adapter description to kdoc
  igb: Define igb_pm_ops conditionally on CONFIG_PM
  igc: Avoid transmit queue timeout for XDP
====================

Link: https://lore.kernel.org/r/20230518170942.418109-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>