diff for duplicates of <20191204163235.GA1597@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index b5c624e..34a36c1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -90,8 +90,3 @@ to rework it on top -rc1 fixing up this conflict and the other x86
 32-bit issue that has cropped up.
 
 Steve
-
-_______________________________________________
-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 ece7d65..7ca0e47 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -9,29 +9,29 @@
  "Subject\0Re: [PATCH v15 00/23] Generic page walk and ptdump\0"
  "Date\0Wed, 4 Dec 2019 16:32:35 +0000\0"
  "To\0David Hildenbrand <david@redhat.com>\0"
- "Cc\0Mark Rutland <Mark.Rutland@arm.com>"
-  Peter Zijlstra <peterz@infradead.org>
-  Catalin Marinas <Catalin.Marinas@arm.com>
-  Dave Hansen <dave.hansen@linux.intel.com>
+ "Cc\0Qian Cai <cai@lca.pw>"
+  Andrew Morton <akpm@linux-foundation.org>
   Linux-MM <linux-mm@kvack.org>
-  H. Peter Anvin <hpa@zytor.com>
-  Will Deacon <will@kernel.org>
-  Liang
-  Kan <kan.liang@linux.intel.com>
-  Thomas Hellstrom <thellstrom@vmware.com>
+  Mark Rutland <Mark.Rutland@arm.com>
   the arch/x86 maintainers <x86@kernel.org>
-  Ingo Molnar <mingo@redhat.com>
   Arnd Bergmann <arnd@arndb.de>
+  Ard Biesheuvel <ard.biesheuvel@linaro.org>
+  Peter Zijlstra <peterz@infradead.org>
+  Catalin Marinas <Catalin.Marinas@arm.com>
+  Dave Hansen <dave.hansen@linux.intel.com>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
  " J\303\251r\303\264me Glisse <jglisse@redhat.com>"
-  Qian Cai <cai@lca.pw>
+  Ingo Molnar <mingo@redhat.com>
+  Borislav Petkov <bp@alien8.de>
   Andy Lutomirski <luto@kernel.org>
+  H. Peter Anvin <hpa@zytor.com>
+  James Morse <James.Morse@arm.com>
   Thomas Gleixner <tglx@linutronix.de>
+  Will Deacon <will@kernel.org>
   linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
-  Ard Biesheuvel <ard.biesheuvel@linaro.org>
-  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
-  James Morse <James.Morse@arm.com>
-  Borislav Petkov <bp@alien8.de>
- " Andrew Morton <akpm@linux-foundation.org>\0"
+  Liang
+  Kan <kan.liang@linux.intel.com>
+ " Thomas Hellstrom <thellstrom@vmware.com>\0"
  "\00:1\0"
  "b\0"
  "On Wed, Dec 04, 2019 at 02:56:58PM +0000, David Hildenbrand wrote:\n"
@@ -125,11 +125,6 @@
  "to rework it on top -rc1 fixing up this conflict and the other x86\n"
  "32-bit issue that has cropped up.\n"
  "\n"
- "Steve\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
+ Steve
 
-78ba4473ebd4c972483cb03bd42789b6d8d69300cb4ffcf5ad38431dedad9025
+325e9748b765ab7cb4f4d7914ed0f2d773c20107fb90d0ebe2c8519241105091
