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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/dev/netlink.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
Simple merge

diff --cc drivers/net/ethernet/google/gve/gve_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
index d6c0699bc8cfa8fc2751e5d31cf5396a81a99f5b,58f8ee710912061cc64d60ba769af0bc07598507..43f034e180c41a595ff570b886569685a56f9fee
--- 1/drivers/net/ethernet/microsoft/mana/gdma_main.c
--- 2/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;
  

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.h
Simple merge

diff --cc drivers/pci/controller/pci-hyperv.c
Simple merge

diff --cc net/key/af_key.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge