Commit 2696e451 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
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: default avatarJakub Kicinski <kuba@kernel.org>
parents 702c290a bfc64d9b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment