Jakub Kicinski 2696e451df 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 e15c5506dd ("net: enetc: allocate vf_state during PF probes") 3774409fd4 ("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 de794169cf ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7") 4a7b2ba94a ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-11-07 13:44:16 -08:00
..
emac_main.c
emac_mdio.c
emac_rockchip.c
emac.h
Kconfig
Makefile