diff for duplicates of <20190806044919.10622-5-bauerman@linux.ibm.com>

diff --git a/a/1.txt b/N1/1.txt
index b2ea02c..9b5b3b1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -93,7 +93,3 @@ index 470bd53a89df..0c5b0ff9eb29 100644
  #ifdef CONFIG_AMD_MEM_ENCRYPT
  /*
   * The __sme_set() and __sme_clr() macros are useful for adding or removing
-_______________________________________________
-iommu mailing list
-iommu@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/iommu
diff --git a/a/content_digest b/N1/content_digest
index 699c82e..a98915e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,29 @@
  "ref\020190806044919.10622-1-bauerman@linux.ibm.com\0"
  "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0"
- "Subject\0[PATCH v4 4/6] x86, s390/mm: Move sme_active() and sme_me_mask to x86-specific header\0"
+ "Subject\0[PATCH v4 4/6] x86,s390/mm: Move sme_active() and sme_me_mask to x86-specific header\0"
  "Date\0Tue,  6 Aug 2019 01:49:17 -0300\0"
  "To\0x86@kernel.org\0"
- "Cc\0linux-s390@vger.kernel.org"
-  Lianbo Jiang <lijiang@redhat.com>
-  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-  Robin Murphy <robin.murphy@arm.com>
-  Mike Anderson <andmike@linux.ibm.com>
-  Ram Pai <linuxram@us.ibm.com>
+ "Cc\0iommu@lists.linux-foundation.org"
+  linux-fsdevel@vger.kernel.org
+  linuxppc-dev@lists.ozlabs.org
+  linux-s390@vger.kernel.org
   linux-kernel@vger.kernel.org
-  Alexey Dobriyan <adobriyan@gmail.com>
-  Halil Pasic <pasic@linux.ibm.com>
-  iommu@lists.linux-foundation.org
+  Thomas Gleixner <tglx@linutronix.de>
   Ingo Molnar <mingo@redhat.com>
   Borislav Petkov <bp@alien8.de>
-  Tom Lendacky <thomas.lendacky@amd.com>
   H. Peter Anvin <hpa@zytor.com>
-  linux-fsdevel@vger.kernel.org
-  Thomas Gleixner <tglx@linutronix.de>
-  linuxppc-dev@lists.ozlabs.org
- " Christoph Hellwig <hch@lst.de>\0"
+  Christoph Hellwig <hch@lst.de>
+  Marek Szyprowski <m.szyprowski@samsung.com>
+  Robin Murphy <robin.murphy@arm.com>
+  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+  Alexey Dobriyan <adobriyan@gmail.com>
+  Thomas Lendacky <Thomas.Lendacky@amd.com>
+  Halil Pasic <pasic@linux.ibm.com>
+  Lianbo Jiang <lijiang@redhat.com>
+  Mike Anderson <andmike@linux.ibm.com>
+  Ram Pai <linuxram@us.ibm.com>
+  Thiago Jung Bauermann <bauerman@linux.ibm.com>
+ " Tom Lendacky <thomas.lendacky@amd.com>\0"
  "\00:1\0"
  "b\0"
  "Now that generic code doesn't reference them, move sme_active() and\n"
@@ -117,10 +120,6 @@
  "-\n"
  " #ifdef CONFIG_AMD_MEM_ENCRYPT\n"
  " /*\n"
- "  * The __sme_set() and __sme_clr() macros are useful for adding or removing\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+   * The __sme_set() and __sme_clr() macros are useful for adding or removing
 
-4578cba1053628694b900d1781357623ae837a980012f1de5d7f91c7e1b22333
+e53b2062f910d2ebfa6996f3ec85a3ff85abea164b7ff81441fe8e138d320101
