Skip to content
Snippets Groups Projects
Commit 46ae4d0a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Cross-merge networking fixes after downstream PR.

No conflicts (sort of) and no adjacent changes.

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3cfb5aa1 5abfdfd4
No related branches found
No related tags found
Loading
Showing
with 399 additions and 62 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment