diff for duplicates of <20181205094706.7225-6-sashal@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index df7fd5a..239efa4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-From: Florian Westphal <fw@strlen.de>
+From: Florian Westphal <fw at strlen.de>
[ Upstream commit 25d8bcedbf4329895dbaf9dd67baa6f18dad918c ]
@@ -12,9 +12,9 @@ This would have caught the bug fixed in previous change
("netfilter: nf_tables: do not skip inactive chains during generation update")
sooner.
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Florian Westphal <fw at strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
+Signed-off-by: Sasha Levin <sashal at kernel.org>
---
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/netfilter/Makefile | 6 ++
diff --git a/a/content_digest b/N1/content_digest
index f2a77f1..925e41b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020181205094706.7225-1-sashal\@kernel.org\0"
]
[
- "From\0Sasha Levin <sashal\@kernel.org>\0"
+ "From\0sashal at kernel.org (Sasha Levin)\0"
]
[
"Subject\0[PATCH AUTOSEL 4.9 06/45] selftests: add script to stress-test nft packet path vs. control plane\0"
@@ -10,16 +10,6 @@
[
"Date\0Wed, 5 Dec 2018 04:46:27 -0500\0"
]
-[
- "To\0stable\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Florian Westphal <fw\@strlen.de>",
- " Pablo Neira Ayuso <pablo\@netfilter.org>",
- " Sasha Levin <sashal\@kernel.org>",
- " linux-kselftest\@vger.kernel.org\0"
-]
[
"\0000:1\0"
]
@@ -27,7 +17,7 @@
"b\0"
]
[
- "From: Florian Westphal <fw\@strlen.de>\n",
+ "From: Florian Westphal <fw at strlen.de>\n",
"\n",
"[ Upstream commit 25d8bcedbf4329895dbaf9dd67baa6f18dad918c ]\n",
"\n",
@@ -41,9 +31,9 @@
"(\"netfilter: nf_tables: do not skip inactive chains during generation update\")\n",
"sooner.\n",
"\n",
- "Signed-off-by: Florian Westphal <fw\@strlen.de>\n",
- "Signed-off-by: Pablo Neira Ayuso <pablo\@netfilter.org>\n",
- "Signed-off-by: Sasha Levin <sashal\@kernel.org>\n",
+ "Signed-off-by: Florian Westphal <fw at strlen.de>\n",
+ "Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>\n",
+ "Signed-off-by: Sasha Levin <sashal at kernel.org>\n",
"---\n",
" tools/testing/selftests/Makefile | 1 +\n",
" tools/testing/selftests/netfilter/Makefile | 6 ++\n",
@@ -174,4 +164,4 @@
"2.17.1"
]
-4fec07506c73feb0257dbec67222b9d6d37a71d67a85518a94cc3ff02461c899
+7a3fa12dc28e5bae1bede36483612542e5c6a747b85fef01530154f90ecead4b
diff --git a/a/1.txt b/N2/1.txt
index df7fd5a..aa21293 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -12,9 +12,9 @@ This would have caught the bug fixed in previous change
("netfilter: nf_tables: do not skip inactive chains during generation update")
sooner.
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Florian Westphal <fw at strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
+Signed-off-by: Sasha Levin <sashal at kernel.org>
---
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/netfilter/Makefile | 6 ++
diff --git a/a/content_digest b/N2/content_digest
index f2a77f1..ddb3d1c 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020181205094706.7225-1-sashal\@kernel.org\0"
]
[
- "From\0Sasha Levin <sashal\@kernel.org>\0"
+ "From\0sashal\@kernel.org (Sasha Levin)\0"
]
[
"Subject\0[PATCH AUTOSEL 4.9 06/45] selftests: add script to stress-test nft packet path vs. control plane\0"
@@ -10,16 +10,6 @@
[
"Date\0Wed, 5 Dec 2018 04:46:27 -0500\0"
]
-[
- "To\0stable\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Florian Westphal <fw\@strlen.de>",
- " Pablo Neira Ayuso <pablo\@netfilter.org>",
- " Sasha Levin <sashal\@kernel.org>",
- " linux-kselftest\@vger.kernel.org\0"
-]
[
"\0000:1\0"
]
@@ -41,9 +31,9 @@
"(\"netfilter: nf_tables: do not skip inactive chains during generation update\")\n",
"sooner.\n",
"\n",
- "Signed-off-by: Florian Westphal <fw\@strlen.de>\n",
- "Signed-off-by: Pablo Neira Ayuso <pablo\@netfilter.org>\n",
- "Signed-off-by: Sasha Levin <sashal\@kernel.org>\n",
+ "Signed-off-by: Florian Westphal <fw at strlen.de>\n",
+ "Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>\n",
+ "Signed-off-by: Sasha Levin <sashal at kernel.org>\n",
"---\n",
" tools/testing/selftests/Makefile | 1 +\n",
" tools/testing/selftests/netfilter/Makefile | 6 ++\n",
@@ -174,4 +164,4 @@
"2.17.1"
]
-4fec07506c73feb0257dbec67222b9d6d37a71d67a85518a94cc3ff02461c899
+c3c7019139765b1b58976dd1f0169c16d560d4281cd8225d9c954ec2dacb564b
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.