From: Jakub Kicinski Date: Sat, 20 May 2023 04:52:18 +0000 (-0700) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue X-Git-Tag: v6.6.17~4555^2~250 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcbe4ea1985d3123836794be021c39cb33954f9f;p=platform%2Fkernel%2Flinux-rpi.git 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 --- dcbe4ea1985d3123836794be021c39cb33954f9f