From: Jakub Kicinski Date: Tue, 31 Jan 2023 05:02:44 +0000 (-0800) Subject: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84115f0e74ea73eccc44842a125f242a02097493;p=linux.git 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 --- 84115f0e74ea73eccc44842a125f242a02097493