From: Jakub Kicinski Date: Thu, 2 Apr 2026 15:23:55 +0000 (-0700) Subject: Merge branch 'net-hsr-fixes-for-prp-duplication-and-vlan-unwind' X-Git-Tag: v7.0-rc7~28^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be193568bef72c21dc7608ef7bf6232bcf091439;p=thirdparty%2Fkernel%2Fstable.git Merge branch 'net-hsr-fixes-for-prp-duplication-and-vlan-unwind' Luka Gejak says: ==================== net: hsr: fixes for PRP duplication and VLAN unwind This series addresses two logic bugs in the HSR/PRP implementation identified during a protocol audit. These are targeted for the 'net' tree as they fix potential memory corruption and state inconsistency. The primary change resolves a race condition in the node merging path by implementing address-based lock ordering. This ensures that concurrent mutations of sequence blocks do not lead to state corruption or deadlocks. An additional fix corrects asymmetric VLAN error unwinding by implementing a centralized unwind path on slave errors. ==================== Link: https://patch.msgid.link/20260401092243.52121-1-luka.gejak@linux.dev Signed-off-by: Jakub Kicinski --- be193568bef72c21dc7608ef7bf6232bcf091439