diff for duplicates of <E29E8A28-9993-4E6C-B41A-7C0AA51945F3@suse.de>

diff --git a/a/1.txt b/N1/1.txt
index b308f76..c4f1129 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,52 +7,57 @@ computation
 
 > mode according to guest
 > interrupt computation mode found in EPCR.
-> 
+>=20
 > Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
 > ---
 > arch/powerpc/kvm/booke.c |    8 +++++++-
 > 1 files changed, 7 insertions(+), 1 deletions(-)
-> 
+>=20
 > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
 > index d15c4b5..93b48e0 100644
 > --- a/arch/powerpc/kvm/booke.c
 > +++ b/arch/powerpc/kvm/booke.c
-> @@ -287,6 +287,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
+> @@ -287,6 +287,7 @@ static int kvmppc_booke_irqprio_deliver(struct =
+kvm_vcpu *vcpu,
 > 	bool crit;
-> 	bool keep_irq = false;
+> 	bool keep_irq =3D false;
 > 	enum int_class int_class;
-> +	ulong msr_cm = 0;
-> 
+> +	ulong msr_cm =3D 0;
+>=20
 > 	/* Truncate crit indicators in 32 bit mode */
 > 	if (!(vcpu->arch.shared->msr & MSR_SF)) {
-> @@ -299,6 +300,10 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
+> @@ -299,6 +300,10 @@ static int kvmppc_booke_irqprio_deliver(struct =
+kvm_vcpu *vcpu,
 > 	/* ... and we're in supervisor mode */
-> 	crit = crit && !(vcpu->arch.shared->msr & MSR_PR);
-> 
+> 	crit =3D crit && !(vcpu->arch.shared->msr & MSR_PR);
+>=20
 > +#ifdef CONFIG_64BIT
-> +	msr_cm = vcpu->arch.epcr & SPRN_EPCR_ICM ? MSR_CM : 0;
+> +	msr_cm =3D vcpu->arch.epcr & SPRN_EPCR_ICM ? MSR_CM : 0;
 > +#endif
 
-No need for the ifdef, no?. Just mask EPCR_ICM out in the 32-bit host case, then this check is always false on 32-bit hosts.
+No need for the ifdef, no?. Just mask EPCR_ICM out in the 32-bit host =
+case, then this check is always false on 32-bit hosts.
 
 > +
-> 	if (priority == BOOKE_IRQPRIO_EXTERNAL_LEVEL) {
-> 		priority = BOOKE_IRQPRIO_EXTERNAL;
-> 		keep_irq = true;
-> @@ -381,7 +386,8 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
+> 	if (priority =3D=3D BOOKE_IRQPRIO_EXTERNAL_LEVEL) {
+> 		priority =3D BOOKE_IRQPRIO_EXTERNAL;
+> 		keep_irq =3D true;
+> @@ -381,7 +386,8 @@ static int kvmppc_booke_irqprio_deliver(struct =
+kvm_vcpu *vcpu,
 > 			set_guest_esr(vcpu, vcpu->arch.queued_esr);
-> 		if (update_dear == true)
+> 		if (update_dear =3D=3D true)
 > 			set_guest_dear(vcpu, vcpu->arch.queued_dear);
 > -		kvmppc_set_msr(vcpu, vcpu->arch.shared->msr & msr_mask);
 > +		kvmppc_set_msr(vcpu, (vcpu->arch.shared->msr & msr_mask)
 > +				| msr_cm);
 
-Please split this computation out into its own variable and apply the masking regardless. Something like
+Please split this computation out into its own variable and apply the =
+masking regardless. Something like
 
-ulong new_msr = vcpu->arch.shared->msr;
+ulong new_msr =3D vcpu->arch.shared->msr;
 if (vcpu->arch.epcr & SPRN_EPCR_ICM)
-    new_msr |= MSR_CM;
-new_msr &= msr_mask;
+    new_msr |=3D MSR_CM;
+new_msr &=3D msr_mask;
 kvmppc_set_msr(vcpu, new_msr);
 
 Alex
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 6f74800..a56ee45 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,10 +17,10 @@
   "To\0Mihai Caraman <mihai.caraman\@freescale.com>\0"
 ]
 [
-  "Cc\0<kvm-ppc\@vger.kernel.org>",
-  " <kvm\@vger.kernel.org>",
-  " <linuxppc-dev\@lists.ozlabs.org>",
-  " <qemu-ppc\@nongnu.org>\0"
+  "Cc\0qemu-ppc\@nongnu.org",
+  " linuxppc-dev\@lists.ozlabs.org",
+  " kvm\@vger.kernel.org",
+  " kvm-ppc\@vger.kernel.org\0"
 ]
 [
   "\0000:1\0"
@@ -38,55 +38,60 @@
   "\n",
   "> mode according to guest\n",
   "> interrupt computation mode found in EPCR.\n",
-  "> \n",
+  ">=20\n",
   "> Signed-off-by: Mihai Caraman <mihai.caraman\@freescale.com>\n",
   "> ---\n",
   "> arch/powerpc/kvm/booke.c |    8 +++++++-\n",
   "> 1 files changed, 7 insertions(+), 1 deletions(-)\n",
-  "> \n",
+  ">=20\n",
   "> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\n",
   "> index d15c4b5..93b48e0 100644\n",
   "> --- a/arch/powerpc/kvm/booke.c\n",
   "> +++ b/arch/powerpc/kvm/booke.c\n",
-  "> \@\@ -287,6 +287,7 \@\@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,\n",
+  "> \@\@ -287,6 +287,7 \@\@ static int kvmppc_booke_irqprio_deliver(struct =\n",
+  "kvm_vcpu *vcpu,\n",
   "> \tbool crit;\n",
-  "> \tbool keep_irq = false;\n",
+  "> \tbool keep_irq =3D false;\n",
   "> \tenum int_class int_class;\n",
-  "> +\tulong msr_cm = 0;\n",
-  "> \n",
+  "> +\tulong msr_cm =3D 0;\n",
+  ">=20\n",
   "> \t/* Truncate crit indicators in 32 bit mode */\n",
   "> \tif (!(vcpu->arch.shared->msr & MSR_SF)) {\n",
-  "> \@\@ -299,6 +300,10 \@\@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,\n",
+  "> \@\@ -299,6 +300,10 \@\@ static int kvmppc_booke_irqprio_deliver(struct =\n",
+  "kvm_vcpu *vcpu,\n",
   "> \t/* ... and we're in supervisor mode */\n",
-  "> \tcrit = crit && !(vcpu->arch.shared->msr & MSR_PR);\n",
-  "> \n",
+  "> \tcrit =3D crit && !(vcpu->arch.shared->msr & MSR_PR);\n",
+  ">=20\n",
   "> +#ifdef CONFIG_64BIT\n",
-  "> +\tmsr_cm = vcpu->arch.epcr & SPRN_EPCR_ICM ? MSR_CM : 0;\n",
+  "> +\tmsr_cm =3D vcpu->arch.epcr & SPRN_EPCR_ICM ? MSR_CM : 0;\n",
   "> +#endif\n",
   "\n",
-  "No need for the ifdef, no?. Just mask EPCR_ICM out in the 32-bit host case, then this check is always false on 32-bit hosts.\n",
+  "No need for the ifdef, no?. Just mask EPCR_ICM out in the 32-bit host =\n",
+  "case, then this check is always false on 32-bit hosts.\n",
   "\n",
   "> +\n",
-  "> \tif (priority == BOOKE_IRQPRIO_EXTERNAL_LEVEL) {\n",
-  "> \t\tpriority = BOOKE_IRQPRIO_EXTERNAL;\n",
-  "> \t\tkeep_irq = true;\n",
-  "> \@\@ -381,7 +386,8 \@\@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,\n",
+  "> \tif (priority =3D=3D BOOKE_IRQPRIO_EXTERNAL_LEVEL) {\n",
+  "> \t\tpriority =3D BOOKE_IRQPRIO_EXTERNAL;\n",
+  "> \t\tkeep_irq =3D true;\n",
+  "> \@\@ -381,7 +386,8 \@\@ static int kvmppc_booke_irqprio_deliver(struct =\n",
+  "kvm_vcpu *vcpu,\n",
   "> \t\t\tset_guest_esr(vcpu, vcpu->arch.queued_esr);\n",
-  "> \t\tif (update_dear == true)\n",
+  "> \t\tif (update_dear =3D=3D true)\n",
   "> \t\t\tset_guest_dear(vcpu, vcpu->arch.queued_dear);\n",
   "> -\t\tkvmppc_set_msr(vcpu, vcpu->arch.shared->msr & msr_mask);\n",
   "> +\t\tkvmppc_set_msr(vcpu, (vcpu->arch.shared->msr & msr_mask)\n",
   "> +\t\t\t\t| msr_cm);\n",
   "\n",
-  "Please split this computation out into its own variable and apply the masking regardless. Something like\n",
+  "Please split this computation out into its own variable and apply the =\n",
+  "masking regardless. Something like\n",
   "\n",
-  "ulong new_msr = vcpu->arch.shared->msr;\n",
+  "ulong new_msr =3D vcpu->arch.shared->msr;\n",
   "if (vcpu->arch.epcr & SPRN_EPCR_ICM)\n",
-  "    new_msr |= MSR_CM;\n",
-  "new_msr &= msr_mask;\n",
+  "    new_msr |=3D MSR_CM;\n",
+  "new_msr &=3D msr_mask;\n",
   "kvmppc_set_msr(vcpu, new_msr);\n",
   "\n",
   "Alex"
 ]
 
-17b89f30bb4d52409f61d38c4abb4363f4187de2ced1ef9f0f484f19afee297e
+44c8c3d709de689c46250e1496b16c9df63989efbdb21d55888bef5137647468
