diff for duplicates of <20200526061309.GA15549@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index a5737fc..67808b4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,3 +17,8 @@ get the actual changes in.  All these conflicts seem to be about the
 last three cleanup patches just doing renaming, so can we just skip
 those three for now?  Then we can do the rename right after 5.8-rc1
 when we have the least chances for conflicts.
+
+_______________________________________________
+linux-um mailing list
+linux-um@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-um
diff --git a/a/content_digest b/N1/content_digest
index 68b1ec8..af7d831 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,18 +4,18 @@
  "Subject\0Re: clean up and streamline probe_kernel_* and friends v4\0"
  "Date\0Tue, 26 May 2020 08:13:09 +0200\0"
  "To\0Andrew Morton <akpm@linux-foundation.org>\0"
- "Cc\0Christoph Hellwig <hch@lst.de>"
+ "Cc\0linux-parisc@vger.kernel.org"
+  Daniel Borkmann <daniel@iogearbox.net>
+  netdev@vger.kernel.org
   x86@kernel.org
+  linux-um@lists.infradead.org
   Alexei Starovoitov <ast@kernel.org>
-  Daniel Borkmann <daniel@iogearbox.net>
+  linux-kernel@vger.kernel.org
+  linux-mm@kvack.org
   Masami Hiramatsu <mhiramat@kernel.org>
-  Linus Torvalds <torvalds@linux-foundation.org>
-  linux-parisc@vger.kernel.org
-  linux-um@lists.infradead.org
-  netdev@vger.kernel.org
   bpf@vger.kernel.org
-  linux-mm@kvack.org
- " linux-kernel@vger.kernel.org\0"
+  Linus Torvalds <torvalds@linux-foundation.org>
+ " Christoph Hellwig <hch@lst.de>\0"
  "\00:1\0"
  "b\0"
  "On Mon, May 25, 2020 at 03:19:12PM -0700, Andrew Morton wrote:\n"
@@ -36,6 +36,11 @@
  "get the actual changes in.  All these conflicts seem to be about the\n"
  "last three cleanup patches just doing renaming, so can we just skip\n"
  "those three for now?  Then we can do the rename right after 5.8-rc1\n"
- when we have the least chances for conflicts.
+ "when we have the least chances for conflicts.\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-um mailing list\n"
+ "linux-um@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-um
 
-02b4d0695ae067f58738f25c555b560d30c0f381c40c5552c60dd366833a0ade
+b8a8aa7edd525829757e221b96cb6169b3abb8b438137cb3ea04c7eed6c38257
