Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net...
authorJakub Kicinski <kuba@kernel.org>
Tue, 31 Jan 2023 05:02:44 +0000 (21:02 -0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 31 Jan 2023 05:02:44 +0000 (21:02 -0800)
commit84115f0e74ea73eccc44842a125f242a02097493
treee068360a78375d20084e2ad8a156c838c8a4fdb3
parent73a876022273cbc9c1db7869a54444ce8b9d085e
parent53b9b77dcf48dad1c6111b0c0a7310b3f9364776
Merge branch '100GbE' of git://git./linux/kernel/git/tnguy/net-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-01-27 (ice)

This series contains updates to ice driver only.

Dave prevents modifying channels when RDMA is active as this will break
RDMA traffic.

Michal fixes a broken URL.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: Fix broken link in ice NAPI doc
  ice: Prevent set_channel from changing queues while RDMA active
====================

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