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 <matthieu.baerts@tessares.net>

.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.