Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 27 Feb 2025 18:14:23 +0000 (10:14 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 27 Feb 2025 18:20:58 +0000 (10:20 -0800)
commit357660d7596bd40d1004762739e426b1fbe10a14
treefeb18577cb2b07ee34bf9d64f8d79f39811583cc
parent7fe0353606d77a32c4c7f2814833dd1c043ebdd2
parent1e15510b71c99c6e49134d756df91069f7d18141
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.14-rc5).

Conflicts:

drivers/net/ethernet/cadence/macb_main.c
  fa52f15c745c ("net: cadence: macb: Synchronize stats calculations")
  75696dd0fd72 ("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
  79990cf5e7ad ("ice: Fix deinitializing VF in error path")
  a203163274a4 ("ice: simplify VF MSI-X managing")

net/ipv4/tcp.c
  18912c520674 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace")
  297d389e9e5b ("net: prefix devmem specific helpers")

net/mptcp/subflow.c
  8668860b0ad3 ("mptcp: reset when MPTCP opts are dropped after join")
  c3349a22c200 ("mptcp: consolidate subflow cleanup")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
24 files changed:
MAINTAINERS
drivers/net/ethernet/cadence/macb.h
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_sriov.c
drivers/net/ethernet/intel/idpf/idpf_txrx.c
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
include/net/sock.h
include/net/tcp.h
kernel/bpf/btf.c
net/core/dev.c
net/core/gro.c
net/core/skbuff.c
net/core/sock.c
net/ethtool/common.c
net/ethtool/ioctl.c
net/ipv4/tcp.c
net/ipv4/tcp_minisocks.c
net/mptcp/pm_netlink.c
net/mptcp/protocol.h
net/mptcp/subflow.c
net/netlink/af_netlink.c
net/unix/af_unix.c
tools/testing/selftests/drivers/net/queues.py