diff for duplicates of <20190327180158.10245-218-sashal@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index ccc7316..970a643 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-From: Stanislav Fomichev <sdf@google.com>
+From: Stanislav Fomichev <sdf at google.com>
 
 [ Upstream commit 2f0921262ba943fe9d9f59037a033927d8c4789b ]
 
@@ -20,10 +20,10 @@ v2:
 * use llvm-readelf instead of redirecting binutils' readelf stderr to
   /dev/null
 
-Signed-off-by: Stanislav Fomichev <sdf@google.com>
-Acked-by: Song Liu <songliubraving@fb.com>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Stanislav Fomichev <sdf at google.com>
+Acked-by: Song Liu <songliubraving at fb.com>
+Signed-off-by: Daniel Borkmann <daniel at iogearbox.net>
+Signed-off-by: Sasha Levin <sashal at kernel.org>
 ---
  tools/testing/selftests/bpf/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/a/content_digest b/N1/content_digest
index 022a71c..b6b5b36 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020190327180158.10245-1-sashal\@kernel.org\0"
 ]
 [
-  "From\0Sasha Levin <sashal\@kernel.org>\0"
+  "From\0sashal at kernel.org (Sasha Levin)\0"
 ]
 [
   "Subject\0[PATCH AUTOSEL 5.0 218/262] selftests/bpf: suppress readelf stderr when probing for BTF support\0"
@@ -10,18 +10,6 @@
 [
   "Date\0Wed, 27 Mar 2019 14:01:13 -0400\0"
 ]
-[
-  "To\0linux-kernel\@vger.kernel.org",
-  " stable\@vger.kernel.org\0"
-]
-[
-  "Cc\0Stanislav Fomichev <sdf\@google.com>",
-  " Daniel Borkmann <daniel\@iogearbox.net>",
-  " Sasha Levin <sashal\@kernel.org>",
-  " linux-kselftest\@vger.kernel.org",
-  " netdev\@vger.kernel.org",
-  " bpf\@vger.kernel.org\0"
-]
 [
   "\0000:1\0"
 ]
@@ -29,7 +17,7 @@
   "b\0"
 ]
 [
-  "From: Stanislav Fomichev <sdf\@google.com>\n",
+  "From: Stanislav Fomichev <sdf at google.com>\n",
   "\n",
   "[ Upstream commit 2f0921262ba943fe9d9f59037a033927d8c4789b ]\n",
   "\n",
@@ -51,10 +39,10 @@
   "* use llvm-readelf instead of redirecting binutils' readelf stderr to\n",
   "  /dev/null\n",
   "\n",
-  "Signed-off-by: Stanislav Fomichev <sdf\@google.com>\n",
-  "Acked-by: Song Liu <songliubraving\@fb.com>\n",
-  "Signed-off-by: Daniel Borkmann <daniel\@iogearbox.net>\n",
-  "Signed-off-by: Sasha Levin <sashal\@kernel.org>\n",
+  "Signed-off-by: Stanislav Fomichev <sdf at google.com>\n",
+  "Acked-by: Song Liu <songliubraving at fb.com>\n",
+  "Signed-off-by: Daniel Borkmann <daniel at iogearbox.net>\n",
+  "Signed-off-by: Sasha Levin <sashal at kernel.org>\n",
   "---\n",
   " tools/testing/selftests/bpf/Makefile | 3 ++-\n",
   " 1 file changed, 2 insertions(+), 1 deletion(-)\n",
@@ -84,4 +72,4 @@
   "2.19.1"
 ]
 
-44ada0682bbb7b893a2f9a38862bb1540210c21ae51f36697b8d06cc36fed3de
+58e47ce42293a4e2cddc52bdfc1a5690292f9f6ef0e5e283e1a7fba04c974323
