From 421d29bbcc65b1b2c45d58b018cfd016b1399be5 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matthieu.baerts@tessares.net>
Date: Thu, 3 Jun 2021 16:56:43 +0200
Subject: [PATCH] DO-NOT-MERGE: git markup: fixes other trees

All commits older than this one are fixes for other trees than the net
ones 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.

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 <matthieu.baerts@tessares.net>
---
 .git_markup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.git_markup b/.git_markup
index 9a4dea8f8f512..db48e96ccd7c4 100644
--- 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.