From: David S. Miller Date: Tue, 23 Nov 2021 12:10:07 +0000 (+0000) 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=52911bb62ed82f0ba4dfddcd1540494d78b1a717;p=linux.git Merge branch '100GbE' of git://git./linux/kernel/git/tnguy/net-queue Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2021-11-22 Maciej Fijalkowski says: Here are the two fixes for issues around ethtool's set_channels() callback for ice driver. Both are related to XDP resources. First one corrects the size of vsi->txq_map that is used to track the usage of Tx resources and the second one prevents the wrong refcounting of bpf_prog. ==================== Signed-off-by: David S. Miller --- 52911bb62ed82f0ba4dfddcd1540494d78b1a717