]> 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, 1 Aug 2024 17:43:15 +0000 (10:43 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Aug 2024 17:45:23 +0000 (10:45 -0700)
Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Link: https://patch.msgid.link/20240801131917.34494-1-pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
net/smc/af_smc.c

Simple merge