From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 17 Jul 2025 17:56:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5a19b4ff6a2096225d88cf24cfeef03edc1bed;p=thirdparty%2Flinux.git

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

Cross-merge networking fixes after downstream PR (net-6.16-rc8).

Conflicts:

drivers/net/ethernet/microsoft/mana/gdma_main.c
  9669ddda18fb ("net: mana: Fix warnings for missing export.h header inclusion")
  755391121038 ("net: mana: Allocate MSI-X vectors dynamically")
https://lore.kernel.org/20250711130752.23023d98@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/ti/icssg/icssg_prueth.h
  6e86fb73de0f ("net: ti: icssg-prueth: Fix buffer allocation for ICSSG")
  ffe8a4909176 ("net: ti: icssg-prueth: Read firmware-names from device tree")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

8b5a19b4ff6a2096225d88cf24cfeef03edc1bed
diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
index d6c0699bc8cfa,58f8ee7109120..43f034e180c41
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@@ -6,11 -6,9 +6,12 @@@
  #include <linux/pci.h>
  #include <linux/utsname.h>
  #include <linux/version.h>
 +#include <linux/msi.h>
 +#include <linux/irqdomain.h>
+ #include <linux/export.h>
  
  #include <net/mana/mana.h>
 +#include <net/mana/hw_channel.h>
  
  struct dentry *mana_debugfs_root;