]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 2 Apr 2026 17:57:09 +0000 (10:57 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 9 Apr 2026 20:20:59 +0000 (13:20 -0700)
commitb6e39e48469e37057fce27a1b87cf6d3e456aa42
tree1aa6c06171088292548cf8ba04d4e9e0cf1b5b43
parent9700282a7ec721e285771d995ccfe33845e776dc
parenta55f7f5f29b32c2c53cc291899cf9b0c25a07f7c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-7.0-rc8).

Conflicts:

net/ipv6/seg6_iptunnel.c
  c3812651b522f ("seg6: separate dst_cache for input and output paths in seg6 lwtunnel")
  78723a62b969a ("seg6: add per-route tunnel source address")
https://lore.kernel.org/adZhwtOYfo-0ImSa@sirena.org.uk

net/ipv4/icmp.c
  fde29fd934932 ("ipv4: icmp: fix null-ptr-deref in icmp_build_probe()")
  d98adfbdd5c01 ("ipv4: drop ipv6_stub usage and use direct function calls")
https://lore.kernel.org/adO3dccqnr6j-BL9@sirena.org.uk

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/chain_mode.c
  51f4e090b9f8 ("net: stmmac: fix integer underflow in chain mode")
  6b4286e05508 ("net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
25 files changed:
MAINTAINERS
drivers/net/ethernet/airoha/airoha_eth.c
drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/stmicro/stmmac/chain_mode.c
drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
drivers/net/phy/sfp.c
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
drivers/nfc/s3fwrn5/uart.c
net/core/skbuff.c
net/ipv4/nexthop.c
net/ipv6/seg6_iptunnel.c
net/mptcp/protocol.c
net/mptcp/protocol.h
net/mptcp/subflow.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c
net/netfilter/nft_ct.c
net/rxrpc/output.c
net/tls/tls_sw.c
net/xfrm/xfrm_policy.c
tools/testing/selftests/net/Makefile