DO-NOT-MERGE: git markup: fixes other trees

matttbe · matttbe · commit 395412a43734 · 2025-03-05T17:13:52.000+01:00
All commits older than this one are fixes for other trees than the -net
one or imported from elsewhere. We should not send these commits to
either -net or net-next or at least not as "MPTCP fixes".

Typically they are fixing issues blocking our tests or dev.

Following commits are MPTCP-related fixes for the -net tree.

This commit is useful to easily find where are the fixes from/for other
trees.

Signed-off-by: Matthieu Baerts &lt;matttbe@kernel.org&gt;
diff --git a/.git_markup b/.git_markup
@@ -1,2 +1 @@
-Fixes for other trees than the -net ones or imported from elsewhere.
-We should not send these commits to either -net or net-next.
+MPTCP-related fixes for -net tree.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-Fixes for other trees than the -net ones or imported from elsewhere.`
`2`		`-We should not send these commits to either -net or net-next.`
	`1`	`+MPTCP-related fixes for -net tree.`