[PATCH net] devlink: Fix accidental merge error in nested devlink docs
DORMANTno replies
From: Tariq Toukan <tariqt@nvidia.com>
Date: 2026-10-11 09:08:14
Also in:
linux-doc, lkml
Subsystem:
documentation, networking [general], the rest · Maintainers:
Jonathan Corbet, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Cosmin Ratiu <redacted>
The referenced "Fixes" commit accidentally reverted a correction
introduced in commit [1].
Revert that mistake.
[1] commit e504cf18ef47 ("docs: net: fix minor issues with devlink
docs")
Fixes: 3bf4c5970ca8 ("devlink: Update nested instance locking comment")
Signed-off-by: Cosmin Ratiu <redacted>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
Documentation/networking/devlink/index.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/networking/devlink/index.rst b/Documentation/networking/devlink/index.rst
index d4a83fdcff7f..64e498e4ff16 100644
--- a/Documentation/networking/devlink/index.rst
+++ b/Documentation/networking/devlink/index.rst@@ -33,8 +33,8 @@ sure to respect following rules: lock of both nested and parent instances at the same time, devlink instance lock of the nested instance should be taken first, only then instance lock of the parent instance could be taken. - - Driver should use object-specific helpers to setup the - nested relationship: + - Driver should use object-specific helpers to setup the nested relationship + before registering the nested devlink instance: - ``devl_nested_devlink_set()`` - called to setup devlink -> nested devlink relationship (could be used for multiple nested instances).
base-commit: af32da41b0327b9c6a37856ba82b6760d6c8d10e -- 2.44.0