Cross-merge networking fixes after downstream PR (net-6.12-rc7). Conflicts: drivers/net/ethernet/freescale/enetc/enetc_pf.c e15c5506 ("net: enetc: allocate vf_state during PF probes") 3774409f ("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 de794169 ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7") 4a7b2ba9 ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please sign in to comment