From 8c614ca9a7ada19b2cd1d5e050cf6c333a1a5196 Mon Sep 17 00:00:00 2001 From: Matthieu Baerts Date: Sat, 14 May 2022 13:22:32 +0200 Subject: [PATCH] DO-NOT-MERGE: git markup: fixes net-next All commits older than this one are MPTCP-related fixes for net-next tree. Following commits are new MPTCP-related features for net-next tree. This commit is useful to easily find where are MPTCP-related fixes for net-next tree. Signed-off-by: Matthieu Baerts --- .git_markup | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.git_markup b/.git_markup index 468af0d5f2ba2..55c6fd576eb14 100644 --- a/.git_markup +++ b/.git_markup @@ -1,7 +1 @@ -<<<<<<< t/DO-NOT-MERGE-git-markup-fixes-net-next base -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 modifications only needed for the -net tree. ->>>>>>> t/DO-NOT-MERGE-git-markup-end-common-net-net-next MPTCP-related features for net-next tree.