diff for duplicates of <20191024193856.GA28043@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 29fdc19..c962495 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,7 +28,7 @@ static inline void kvm_memslot_delete(struct kvm_memslots *slots,
 	struct kvm_memory_slot *mslots = slots->memslots;
 	int i;
 
-	if (WARN_ON(slots->id_to_index[memslot->id] = -1))
+	if (WARN_ON(slots->id_to_index[memslot->id] == -1))
 		return;
 
 	slots->used_slots--;
@@ -63,7 +63,7 @@ static inline int kvm_memslot_move_backward(struct kvm_memslots *slots,
 	struct kvm_memory_slot *mslots = slots->memslots;
 	int i;
 
-	if (WARN_ON_ONCE(slots->id_to_index[memslot->id] = -1) ||
+	if (WARN_ON_ONCE(slots->id_to_index[memslot->id] == -1) ||
 	    WARN_ON_ONCE(!slots->used_slots))
 		return -1;
 
@@ -71,7 +71,7 @@ static inline int kvm_memslot_move_backward(struct kvm_memslots *slots,
 		if (memslot->base_gfn > mslots[i + 1].base_gfn)
 			break;
 
-		WARN_ON_ONCE(memslot->base_gfn = mslots[i + 1].base_gfn);
+		WARN_ON_ONCE(memslot->base_gfn == mslots[i + 1].base_gfn);
 
 		/* Shift the next memslot forward one and update its index. */
 		mslots[i] = mslots[i + 1];
@@ -98,7 +98,7 @@ static inline int kvm_memslot_move_forward(struct kvm_memslots *slots,
 		if (memslot->base_gfn < mslots[i - 1].base_gfn)
 			break;
 
-		WARN_ON_ONCE(memslot->base_gfn = mslots[i - 1].base_gfn);
+		WARN_ON_ONCE(memslot->base_gfn == mslots[i - 1].base_gfn);
 
 		/* Shift the next memslot back one and update its index. */
 		mslots[i] = mslots[i - 1];
@@ -145,10 +145,10 @@ static void update_memslots(struct kvm_memslots *slots,
 {
 	int i;
 
-	if (change = KVM_MR_DELETE) {
+	if (change == KVM_MR_DELETE) {
 		kvm_memslot_delete(slots, memslot);
 	} else {
-		if (change = KVM_MR_CREATE)
+		if (change == KVM_MR_CREATE)
 			i = kvm_memslot_insert_back(slots);
 		else
 			i = kvm_memslot_move_backward(slots, memslot);
@@ -162,3 +162,8 @@ static void update_memslots(struct kvm_memslots *slots,
 		slots->id_to_index[memslot->id] = i;
 	}
 }
+
+_______________________________________________
+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 7580369..bcb86e5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,29 +7,25 @@
  "ref\05c61c094-ee32-4dcf-b3ae-092eba0159c5@redhat.com\0"
  "From\0Sean Christopherson <sean.j.christopherson@intel.com>\0"
  "Subject\0Re: [PATCH v2 14/15] KVM: Terminate memslot walks via used_slots\0"
- "Date\0Thu, 24 Oct 2019 19:38:56 +0000\0"
+ "Date\0Thu, 24 Oct 2019 12:38:56 -0700\0"
  "To\0Paolo Bonzini <pbonzini@redhat.com>\0"
- "Cc\0James Hogan <jhogan@kernel.org>"
-  Paul Mackerras <paulus@ozlabs.org>
-  Christian Borntraeger <borntraeger@de.ibm.com>
-  Janosch Frank <frankja@linux.ibm.com>
- " Radim Kr\304\215m\303\241\305\231 <rkrcmar@redhat.com>"
-  Marc Zyngier <maz@kernel.org>
-  David Hildenbrand <david@redhat.com>
-  Cornelia Huck <cohuck@redhat.com>
-  Vitaly Kuznetsov <vkuznets@redhat.com>
+ "Cc\0Cornelia Huck <cohuck@redhat.com>"
   Wanpeng Li <wanpengli@tencent.com>
-  Jim Mattson <jmattson@google.com>
+  Janosch Frank <frankja@linux.ibm.com>
+  kvm@vger.kernel.org
+  James Hogan <jhogan@kernel.org>
   Joerg Roedel <joro@8bytes.org>
-  James Morse <james.morse@arm.com>
-  Julien Thierry <julien.thierry.kdev@gmail.com>
-  Suzuki K Poulose <suzuki.poulose@arm.com>
+  David Hildenbrand <david@redhat.com>
   linux-mips@vger.kernel.org
   kvm-ppc@vger.kernel.org
-  kvm@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  Paul Mackerras <paulus@ozlabs.org>
+  Christian Borntraeger <borntraeger@de.ibm.com>
   linux-arm-kernel@lists.infradead.org
+  Marc Zyngier <maz@kernel.org>
+  Vitaly Kuznetsov <vkuznets@redhat.com>
   kvmarm@lists.cs.columbia.edu
- " linux-kernel@vger.kernel.org\0"
+ " Jim Mattson <jmattson@google.com>\0"
  "\00:1\0"
  "b\0"
  "On Tue, Oct 22, 2019 at 05:53:27PM +0200, Paolo Bonzini wrote:\n"
@@ -62,7 +58,7 @@
  "\tstruct kvm_memory_slot *mslots = slots->memslots;\n"
  "\tint i;\n"
  "\n"
- "\tif (WARN_ON(slots->id_to_index[memslot->id] = -1))\n"
+ "\tif (WARN_ON(slots->id_to_index[memslot->id] == -1))\n"
  "\t\treturn;\n"
  "\n"
  "\tslots->used_slots--;\n"
@@ -97,7 +93,7 @@
  "\tstruct kvm_memory_slot *mslots = slots->memslots;\n"
  "\tint i;\n"
  "\n"
- "\tif (WARN_ON_ONCE(slots->id_to_index[memslot->id] = -1) ||\n"
+ "\tif (WARN_ON_ONCE(slots->id_to_index[memslot->id] == -1) ||\n"
  "\t    WARN_ON_ONCE(!slots->used_slots))\n"
  "\t\treturn -1;\n"
  "\n"
@@ -105,7 +101,7 @@
  "\t\tif (memslot->base_gfn > mslots[i + 1].base_gfn)\n"
  "\t\t\tbreak;\n"
  "\n"
- "\t\tWARN_ON_ONCE(memslot->base_gfn = mslots[i + 1].base_gfn);\n"
+ "\t\tWARN_ON_ONCE(memslot->base_gfn == mslots[i + 1].base_gfn);\n"
  "\n"
  "\t\t/* Shift the next memslot forward one and update its index. */\n"
  "\t\tmslots[i] = mslots[i + 1];\n"
@@ -132,7 +128,7 @@
  "\t\tif (memslot->base_gfn < mslots[i - 1].base_gfn)\n"
  "\t\t\tbreak;\n"
  "\n"
- "\t\tWARN_ON_ONCE(memslot->base_gfn = mslots[i - 1].base_gfn);\n"
+ "\t\tWARN_ON_ONCE(memslot->base_gfn == mslots[i - 1].base_gfn);\n"
  "\n"
  "\t\t/* Shift the next memslot back one and update its index. */\n"
  "\t\tmslots[i] = mslots[i - 1];\n"
@@ -179,10 +175,10 @@
  "{\n"
  "\tint i;\n"
  "\n"
- "\tif (change = KVM_MR_DELETE) {\n"
+ "\tif (change == KVM_MR_DELETE) {\n"
  "\t\tkvm_memslot_delete(slots, memslot);\n"
  "\t} else {\n"
- "\t\tif (change = KVM_MR_CREATE)\n"
+ "\t\tif (change == KVM_MR_CREATE)\n"
  "\t\t\ti = kvm_memslot_insert_back(slots);\n"
  "\t\telse\n"
  "\t\t\ti = kvm_memslot_move_backward(slots, memslot);\n"
@@ -195,6 +191,11 @@
  "\t\tslots->memslots[i] = *memslot;\n"
  "\t\tslots->id_to_index[memslot->id] = i;\n"
  "\t}\n"
- }
+ "}\n"
+ "\n"
+ "_______________________________________________\n"
+ "kvmarm mailing list\n"
+ "kvmarm@lists.cs.columbia.edu\n"
+ https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
 
-18bf0ec17c7388cf35909a66a4e26609730b88885c2f12d2bf5787f12747cd42
+c603f3b3cc44e1312b1d92c97b8c95b5192401de5b2037acaeee934f8860cc3f
