From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 23 Aug 2024 00:05:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.12-rc1~232^2~197
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=761d527d5d0036b98a2cecf4de1293d84d452aa1;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.h
  c948c0973df5 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
  f2878cdeb754 ("bnxt_en: Add support to call FW to update a VNIC")

Link: https://patch.msgid.link/20240822210125.1542769-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

761d527d5d0036b98a2cecf4de1293d84d452aa1