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

Cross-merge networking fixes after downstream PR (net-6.12-rc7).

Conflicts:

drivers/net/ethernet/freescale/enetc/enetc_pf.c
  e15c5506dd39 ("net: enetc: allocate vf_state during PF probes")
  3774409fd4c6 ("net: enetc: build enetc_pf_common.c as a separate module")
https://lore.kernel.org/20241105114100.118bd35e@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/ti/am65-cpsw-nuss.c
  de794169cf17 ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7")
  4a7b2ba94a59 ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version")

Signed-off-by: Jakub Kicinski <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc_pf.c
index a76ce41eb197af97c19807670c7309fa61a3d88c,c95a7c083b0f4845104f57cdcf35100de6ba0449..c47b4a743d93b97493db4cb393ca6a57f9bfdb1e
--- 1/drivers/net/ethernet/freescale/enetc/enetc_pf.c
--- 2/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@@ -1023,9 -1276,14 +1014,16 @@@ static int enetc_pf_probe(struct pci_de
  
        pf = enetc_si_priv(si);
        pf->si = si;
-       pf->total_vfs = pci_sriov_get_totalvfs(pdev);
 +      pf->ops = &enetc_pf_ops;
 +
+       pf->total_vfs = pci_sriov_get_totalvfs(pdev);
+       if (pf->total_vfs) {
+               pf->vf_state = kcalloc(pf->total_vfs, sizeof(struct enetc_vf_state),
+                                      GFP_KERNEL);
+               if (!pf->vf_state)
+                       goto err_alloc_vf_state;
+       }
+ 
        err = enetc_setup_mac_addresses(node, pf);
        if (err)
                goto err_setup_mac_addresses;

diff --cc drivers/net/ethernet/freescale/enetc/enetc_vf.c
Simple merge

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
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/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 6201a09fa5f08246e26ce904474368a9811c4d1a,ba6db61dd227c4126cd8bfd49539169da241f63e..47fb5af1679681b0a0634625fdcf163e7d36c377
--- 1/drivers/net/ethernet/ti/am65-cpsw-nuss.c
--- 2/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@@ -1028,10 -1023,12 +1023,10 @@@ pool_free
  static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow,
                             struct am65_cpsw_port *port,
                             struct xdp_buff *xdp,
-                            int desc_idx, int cpu, int *len)
+                            int cpu, int *len)
  {
        struct am65_cpsw_common *common = flow->common;
 -      struct am65_cpsw_ndev_priv *ndev_priv;
        struct net_device *ndev = port->ndev;
 -      struct am65_cpsw_ndev_stats *stats;
        int ret = AM65_CPSW_XDP_CONSUMED;
        struct am65_cpsw_tx_chn *tx_chn;
        struct netdev_queue *netif_txq;
@@@ -1136,8 -1142,10 +1131,9 @@@ static int am65_cpsw_nuss_rx_packets(st
        u32 buf_dma_len, pkt_len, port_id = 0, csum_info;
        struct am65_cpsw_common *common = flow->common;
        struct am65_cpsw_ndev_priv *ndev_priv;
 -      struct am65_cpsw_ndev_stats *stats;
        struct cppi5_host_desc_t *desc_rx;
        struct device *dev = common->dev;
+       struct am65_cpsw_swdata *swdata;
        struct page *page, *new_page;
        dma_addr_t desc_dma, buf_dma;
        struct am65_cpsw_port *port;

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.h
Simple merge

diff --cc drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc net/mptcp/mptcp_pm_gen.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge