tgupdate: merge t/DO-NOT-MERGE-git-markup-features-other-trees base into t/DO-NOT-MERGE-git-markup-features-other-trees

Author: matttbe

Documentation/networking/mptcp-sysctl.rst

@@ -41,7 +41,7 @@ blackhole_timeout - INTEGER (seconds)
 	MPTCP is re-enabled and will reset to the initial value when the
 	blackhole issue goes away.
 
-	0 to disable the blackhole detection.
+	0 to disable the blackhole detection. This is a per-namespace sysctl.
 
 	Default: 3600