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)
commit06f609b3119876b42f19fdb690b10896d3c648e6
tree2f42b892152af80d299133ef6c902261a1fd0b98
parent91374ba537bd60caa9ae052c9f1c0fe055b39149
parentecb1b8288dc7ccbdcb3b9df005fa1c0e0c0388a7
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

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