]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Jan 2026 19:37:07 +0000 (11:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Jan 2026 19:38:33 +0000 (11:38 -0800)
Cross-merge networking fixes after downstream PR (net-6.19-rc5).

No conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
net/ipv4/ping.c
net/ipv4/udp.c

diff --cc net/ipv4/ping.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge