diff for duplicates of <20200924143505.27641-3-fw@strlen.de>
diff --git a/a/1.txt b/N1/1.txt
index 50652cf..2f0ad85 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,3 +1,5 @@
+From: Florian Westphal <fw@strlen.de>
+
Will be needed to fill in the MPTCP reset option from tcp_ipv4/ipv6.c.
It would make more sense to place mptcp_option() in mptcp.h, but
@@ -5,7 +7,7 @@ TCPOPT_MPTCP is defined in tcp.h, and mptcp.h is included from tcp.h,
not the other way around. Placing the helper in mptcp.h thus results
in a build failure because TCPOPT_MPTCP is not defined.
-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 +++++
@@ -82,6 +84,4 @@ index 7cfe52aeb2b8..e8c873c66182 100644
-
static inline bool before64(__u64 seq1, __u64 seq2)
{
- return (__s64)(seq1 - seq2) < 0;
---
-2.26.2
\ No newline at end of file
+ return (__s64)(seq1 - seq2) < 0;
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 194df79..1be50d7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,22 +1,30 @@
[
- "From\0Florian Westphal <fw at strlen.de>\0"
+ "ref\00020210526160813.4160315-1-matthieu.baerts\@tessares.net\0"
]
[
- "Subject\0[MPTCP] [RFC PATCH 2/4] tcp: move selected mptcp helpers to tcp.h/mptcp.h\0"
+ "From\0Matthieu Baerts <matthieu.baerts\@tessares.net>\0"
]
[
- "Date\0Thu, 24 Sep 2020 16:35:03 +0200\0"
+ "Subject\0[RESEND] [MPTCP] [RFC PATCH 2/4] tcp: move selected mptcp helpers to tcp.h/mptcp.h\0"
]
[
- "To\0mptcp at lists.01.org\0"
+ "Date\0Wed, 26 May 2021 18:08:06 +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",
"Will be needed to fill in the MPTCP reset option from tcp_ipv4/ipv6.c.\n",
"\n",
"It would make more sense to place mptcp_option() in mptcp.h, but\n",
@@ -24,7 +32,7 @@
"not the other way around. Placing the helper in mptcp.h thus results\n",
"in a build failure because TCPOPT_MPTCP is not defined.\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",
@@ -101,9 +109,7 @@
"-\n",
" static inline bool before64(__u64 seq1, __u64 seq2)\n",
" {\n",
- " \treturn (__s64)(seq1 - seq2) < 0;\n",
- "-- \n",
- "2.26.2"
+ " \treturn (__s64)(seq1 - seq2) < 0;"
]
-838aab7acf31b6a3bbb26f154cdce5c5ec43274c08bf41a47843f91ff52de13f
+ac80c0fb8facc810a5ff9da5786c9720154861ba94b245221f8b8c38975ae565
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).