Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/net/tcp.h
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Feb 2025 05:02:16 +0000 (16:02 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	patch \|	diff1 \|	diff2 \|	blob \| history