diff for duplicates of <20191010083613.231594675@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 43a2616..aad95ac 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -77,10 +77,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #ifdef CONFIG_ARM64_ERRATUM_1463225
  	{
  		.desc = "ARM erratum 1463225",
-
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index c84414b..d9a5e11 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,14 +4,14 @@
  "Date\0Thu, 10 Oct 2019 10:36:43 +0200\0"
  "To\0linux-kernel@vger.kernel.org"
  " linux-arm-kernel@lists.infradead.org\0"
- "Cc\0Stefan Wahren <stefan.wahren@i2se.com>"
-  Ard Biesheuvel <ard.biesheuvel@linaro.org>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-  Will Deacon <will.deacon@arm.com>
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+  stable@vger.kernel.org
   Jeremy Linton <jeremy.linton@arm.com>
   Andre Przywara <andre.przywara@arm.com>
-  stable@vger.kernel.org
- " Catalin Marinas <catalin.marinas@arm.com>\0"
+  Catalin Marinas <catalin.marinas@arm.com>
+  Stefan Wahren <stefan.wahren@i2se.com>
+  Will Deacon <will.deacon@arm.com>
+ " Ard Biesheuvel <ard.biesheuvel@linaro.org>\0"
  "\00:1\0"
  "b\0"
  "From: Jeremy Linton <jeremy.linton@arm.com>\n"
@@ -92,13 +92,6 @@
  "-#endif\n"
  " #ifdef CONFIG_ARM64_ERRATUM_1463225\n"
  " \t{\n"
- " \t\t.desc = \"ARM erratum 1463225\",\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ " \t\t.desc = \"ARM erratum 1463225\","
 
-76a3631e9cef08b9a77e62700663ea1b59823d4167d4f6d1933806d73402d0fc
+2b184b9078ac9366544ecc0d67a36ce6bc53384c7326341d02f129f279b48b85
