diff for duplicates of <20200206050518.GA9401@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 0a2a42d..4f5fe10 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,8 +14,8 @@ On Wed, Feb 05, 2020 at 09:58:58PM -0500, Peter Xu wrote:
 > > > > >                 new.dirty_bitmap = NULL;
 > > > > >  
 > > > > >         r = -ENOMEM;
-> > > > > -       if (change = KVM_MR_CREATE) {
-> > > > > +       if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) {
+> > > > > -       if (change == KVM_MR_CREATE) {
+> > > > > +       if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) {
 > > > > >                 new.userspace_addr = mem->userspace_addr;
 > > > > >  
 > > > > >                 if (kvm_arch_create_memslot(kvm, &new, npages))
@@ -56,3 +56,7 @@ I also don't want to effectively introduce a misnamed function, even if
 only temporarily, e.g. it's kvm_arch_create_memslot(), not
 kvm_arch_create_or_move_memslot(), because the whole flow gets reworked a
 few patches later.
+_______________________________________________
+kvmarm mailing list
+kvmarm@lists.cs.columbia.edu
+https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
diff --git a/a/content_digest b/N1/content_digest
index b82894f..a620c56 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,29 +7,25 @@
  "ref\020200206025858.GK387680@xz-x1\0"
  "From\0Sean Christopherson <sean.j.christopherson@intel.com>\0"
  "Subject\0Re: [PATCH v5 01/19] KVM: x86: Allocate new rmap and large page tracking when moving memslot\0"
- "Date\0Thu, 06 Feb 2020 05:05:19 +0000\0"
+ "Date\0Wed, 5 Feb 2020 21:05:19 -0800\0"
  "To\0Peter Xu <peterx@redhat.com>\0"
- "Cc\0Paolo Bonzini <pbonzini@redhat.com>"
+ "Cc\0Wanpeng Li <wanpengli@tencent.com>"
+  kvm@vger.kernel.org
+  David Hildenbrand <david@redhat.com>
+  linux-mips@vger.kernel.org
   Paul Mackerras <paulus@ozlabs.org>
-  Christian Borntraeger <borntraeger@de.ibm.com>
+  kvmarm@lists.cs.columbia.edu
   Janosch Frank <frankja@linux.ibm.com>
-  David Hildenbrand <david@redhat.com>
-  Cornelia Huck <cohuck@redhat.com>
-  Vitaly Kuznetsov <vkuznets@redhat.com>
-  Wanpeng Li <wanpengli@tencent.com>
-  Jim Mattson <jmattson@google.com>
-  Joerg Roedel <joro@8bytes.org>
   Marc Zyngier <maz@kernel.org>
-  James Morse <james.morse@arm.com>
-  Julien Thierry <julien.thierry.kdev@gmail.com>
-  Suzuki K Poulose <suzuki.poulose@arm.com>
-  linux-mips@vger.kernel.org
-  kvm@vger.kernel.org
+  Joerg Roedel <joro@8bytes.org>
+  Christian Borntraeger <borntraeger@de.ibm.com>
   kvm-ppc@vger.kernel.org
   linux-arm-kernel@lists.infradead.org
-  kvmarm@lists.cs.columbia.edu
+  Jim Mattson <jmattson@google.com>
+  Cornelia Huck <cohuck@redhat.com>
   linux-kernel@vger.kernel.org
-  Christoffer Dall <christoffer.dall@arm.com>
+  Paolo Bonzini <pbonzini@redhat.com>
+  Vitaly Kuznetsov <vkuznets@redhat.com>
  " Philippe Mathieu-Daud\303\251 <f4bug@amsat.org>\0"
  "\00:1\0"
  "b\0"
@@ -49,8 +45,8 @@
  "> > > > >                 new.dirty_bitmap = NULL;\n"
  "> > > > >  \n"
  "> > > > >         r = -ENOMEM;\n"
- "> > > > > -       if (change = KVM_MR_CREATE) {\n"
- "> > > > > +       if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) {\n"
+ "> > > > > -       if (change == KVM_MR_CREATE) {\n"
+ "> > > > > +       if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) {\n"
  "> > > > >                 new.userspace_addr = mem->userspace_addr;\n"
  "> > > > >  \n"
  "> > > > >                 if (kvm_arch_create_memslot(kvm, &new, npages))\n"
@@ -90,6 +86,10 @@
  "I also don't want to effectively introduce a misnamed function, even if\n"
  "only temporarily, e.g. it's kvm_arch_create_memslot(), not\n"
  "kvm_arch_create_or_move_memslot(), because the whole flow gets reworked a\n"
- few patches later.
+ "few patches later.\n"
+ "_______________________________________________\n"
+ "kvmarm mailing list\n"
+ "kvmarm@lists.cs.columbia.edu\n"
+ https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
 
-9f0f26ae88b8b093522750da72994f6af829cf92045dc884e1d5f46561be8296
+7a288a6745d143c8dfdcdb8c53dad8b4e5bd958d178268dec6beaadc3cd681ba
