]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 25 Jan 2024 22:00:54 +0000 (14:00 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 25 Jan 2024 22:20:08 +0000 (14:20 -0800)
Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
net/smc/smc_diag.c

Simple merge