diff for duplicates of <20201105170126.5627-2-fw@strlen.de>
diff --git a/a/1.txt b/N1/1.txt
index 472c990..4ab8634 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,9 @@
+From: Florian Westphal <fw@strlen.de>
+
needed by followup patches to add mptcp reset (and fastclose)
options to tcp reset packets.
-Signed-off-by: Florian Westphal <fw(a)strlen.de>
+Signed-off-by: Florian Westphal <fw@strlen.de>
---
include/net/mptcp.h | 10 ++++++++++
include/net/tcp.h | 5 +++++
@@ -78,6 +80,4 @@ index d29c6a4749eb..66bd4d096753 100644
-
void mptcp_diag_subflow_init(struct tcp_ulp_ops *ops);
- static inline bool __mptcp_check_fallback(const struct mptcp_sock *msk)
---
-2.26.2
\ No newline at end of file
+ static inline bool __mptcp_check_fallback(const struct mptcp_sock *msk)
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0d7e90c..2462775 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,34 @@
[
- "From\0Florian Westphal <fw at strlen.de>\0"
+ "ref\00020210526160813.4160315-1-matthieu.baerts\@tessares.net\0"
]
[
- "Subject\0[MPTCP] [PATCH MPTCP 1/5] tcp: make two mptcp helpers available to tcp stack\0"
+ "From\0Matthieu Baerts <matthieu.baerts\@tessares.net>\0"
]
[
- "Date\0Thu, 05 Nov 2020 18:01:22 +0100\0"
+ "Subject\0[RESEND] [MPTCP] [PATCH MPTCP 1/5] tcp: make two mptcp helpers available to tcp stack\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Wed, 26 May 2021 18:08:09 +0200\0"
]
[
- "\0001:1\0"
+ "To\0mptcp\@lists.linux.dev\0"
+]
+[
+ "Cc\0Florian Westphal <fw\@strlen.de>\0"
+]
+[
+ "\0000:1\0"
]
[
"b\0"
]
[
+ "From: Florian Westphal <fw\@strlen.de>\n",
+ "\n",
"needed by followup patches to add mptcp reset (and fastclose)\n",
"options to tcp reset packets.\n",
"\n",
- "Signed-off-by: Florian Westphal <fw(a)strlen.de>\n",
+ "Signed-off-by: Florian Westphal <fw\@strlen.de>\n",
"---\n",
" include/net/mptcp.h | 10 ++++++++++\n",
" include/net/tcp.h | 5 +++++\n",
@@ -97,9 +105,7 @@
"-\n",
" void mptcp_diag_subflow_init(struct tcp_ulp_ops *ops);\n",
" \n",
- " static inline bool __mptcp_check_fallback(const struct mptcp_sock *msk)\n",
- "-- \n",
- "2.26.2"
+ " static inline bool __mptcp_check_fallback(const struct mptcp_sock *msk)"
]
-44befa4b81f3b5286f320cb38887b6099c7811f38ae0c2c101699fa566b7608c
+ad38fd012435df8cd2e3e58d131e67cc195ace924e2aabf6c3122ded5f0bd7dc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).