Cross-merge networking fixes after downstream PR (net-6.14-rc5). Conflicts: drivers/net/ethernet/cadence/macb_main.c fa52f15c ("net: cadence: macb: Synchronize stats calculations") 75696dd0 ("net: cadence: macb: Convert to get_stats64") https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au Adjacent changes: drivers/net/ethernet/intel/ice/ice_sriov.c 79990cf5 ("ice: Fix deinitializing VF in error path") a2031632 ("ice: simplify VF MSI-X managing") net/ipv4/tcp.c 18912c52 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace") 297d389e ("net: prefix devmem specific helpers") net/mptcp/subflow.c 8668860b ("mptcp: reset when MPTCP opts are dropped after join") c3349a22 ("mptcp: consolidate subflow cleanup") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please sign in to comment