From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 6 Sep 2024 03:27:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.12-rc1~232^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46ae4d0a489741565520195bddebc3414781e603;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts (sort of) and no adjacent changes.

This merge reverts commit b3c9e65eb227 ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bdcb04 ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

46ae4d0a489741565520195bddebc3414781e603