diff for duplicates of <5BF008A6-F999-4D08-9CA4-9815DB16D317@suse.de>

diff --git a/a/1.txt b/N1/1.txt
index e199dac..3b4279a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,30 +10,32 @@ On 04.07.2012, at 16:14, Caraman Mihai Claudiu-B02008 wrote:
 >> dev@lists.ozlabs.org; qemu-ppc@nongnu.org
 >> Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in
 >> mtspr/mfspr emulation
->> 
->> 
+>>=20
+>>=20
 >> On 25.06.2012, at 14:26, Mihai Caraman wrote:
->> 
+>>=20
 >>> Add EPCR support in booke mtspr/mfspr emulation. EPCR register is
 >> defined
->>> only for 64-bit and HV categories, so it shoud be available only on 64-
+>>> only for 64-bit and HV categories, so it shoud be available only on =
+64-
 >> bit
 >>> virtual processors. Undefine the support for 32-bit builds.
 >>> Define a reusable setter function for vcpu's EPCR.
->>> 
+>>>=20
 >>> Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
 >>> ---
 >>> arch/powerpc/kvm/booke.c         |   12 +++++++++++-
 >>> arch/powerpc/kvm/booke.h         |    6 ++++++
 >>> arch/powerpc/kvm/booke_emulate.c |   13 ++++++++++++-
 >>> 3 files changed, 29 insertions(+), 2 deletions(-)
->>> 
+>>>=20
 >>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
 >>> index 72f13f4..f9fa260 100644
 >>> --- a/arch/powerpc/kvm/booke.c
 >>> +++ b/arch/powerpc/kvm/booke.c
 >>> @@ -13,7 +13,7 @@
->>> * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+>>> * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  =
+02110-1301,
 >> USA.
 >>> *
 >>> * Copyright IBM Corp. 2007
@@ -42,28 +44,36 @@ On 04.07.2012, at 16:14, Caraman Mihai Claudiu-B02008 wrote:
 >>> *
 >>> * Authors: Hollis Blanchard <hollisb@us.ibm.com>
 >>> *          Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
->>> @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct kvm
+>>> @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct =
+kvm
 >> *kvm,
 >>> {
 >>> }
->>> 
+>>>=20
 >>> +#ifdef CONFIG_64BIT
 >>> +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr)
 >>> +{
->>> +	vcpu->arch.epcr = new_epcr;
->>> +	vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM;
+>>> +	vcpu->arch.epcr =3D new_epcr;
+>>> +	vcpu->arch.shadow_epcr &=3D ~SPRN_EPCR_GICM;
 >>> +	if (vcpu->arch.epcr  & SPRN_EPCR_ICM)
->>> +		vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM;
->> 
->> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too,
+>>> +		vcpu->arch.shadow_epcr |=3D SPRN_EPCR_GICM;
+>>=20
+>> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc =
+too,
 >> no? Please only #ifdef the GICM bits out.
-> 
-> kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc
-> as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT,
-> my assumption was that we will not support a virtual core with 64-bit category
+>=20
+> kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a =
+virtual e500mc
+> as detailed in patch's comment. All callers are also guarded by #ifdef =
+CONFIG_64BIT,
+> my assumption was that we will not support a virtual core with 64-bit =
+category
 > on a 32-bit host.
 
-My main concern is that every #ifdef potentially breaks things without us knowing. So the less #ifdef's we have, the better off we are. The spec only says that we don't _have_ to implement EPCR for non-hv non-64bit systems. It doesn't forbid to do so, right?
+My main concern is that every #ifdef potentially breaks things without =
+us knowing. So the less #ifdef's we have, the better off we are. The =
+spec only says that we don't _have_ to implement EPCR for non-hv =
+non-64bit systems. It doesn't forbid to do so, right?
 
 
 Alex
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index b3dda71..bd21084 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -23,10 +23,10 @@
   "To\0Caraman Mihai Claudiu-B02008 <B02008\@freescale.com>\0"
 ]
 [
-  "Cc\0kvm-ppc\@vger.kernel.org <kvm-ppc\@vger.kernel.org>",
-  " kvm\@vger.kernel.org <kvm\@vger.kernel.org>",
+  "Cc\0qemu-ppc\@nongnu.org <qemu-ppc\@nongnu.org>",
   " linuxppc-dev\@lists.ozlabs.org <linuxppc-dev\@lists.ozlabs.org>",
-  " qemu-ppc\@nongnu.org <qemu-ppc\@nongnu.org>\0"
+  " kvm\@vger.kernel.org <kvm\@vger.kernel.org>",
+  " kvm-ppc\@vger.kernel.org <kvm-ppc\@vger.kernel.org>\0"
 ]
 [
   "\0000:1\0"
@@ -47,30 +47,32 @@
   ">> dev\@lists.ozlabs.org; qemu-ppc\@nongnu.org\n",
   ">> Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in\n",
   ">> mtspr/mfspr emulation\n",
-  ">> \n",
-  ">> \n",
+  ">>=20\n",
+  ">>=20\n",
   ">> On 25.06.2012, at 14:26, Mihai Caraman wrote:\n",
-  ">> \n",
+  ">>=20\n",
   ">>> Add EPCR support in booke mtspr/mfspr emulation. EPCR register is\n",
   ">> defined\n",
-  ">>> only for 64-bit and HV categories, so it shoud be available only on 64-\n",
+  ">>> only for 64-bit and HV categories, so it shoud be available only on =\n",
+  "64-\n",
   ">> bit\n",
   ">>> virtual processors. Undefine the support for 32-bit builds.\n",
   ">>> Define a reusable setter function for vcpu's EPCR.\n",
-  ">>> \n",
+  ">>>=20\n",
   ">>> Signed-off-by: Mihai Caraman <mihai.caraman\@freescale.com>\n",
   ">>> ---\n",
   ">>> arch/powerpc/kvm/booke.c         |   12 +++++++++++-\n",
   ">>> arch/powerpc/kvm/booke.h         |    6 ++++++\n",
   ">>> arch/powerpc/kvm/booke_emulate.c |   13 ++++++++++++-\n",
   ">>> 3 files changed, 29 insertions(+), 2 deletions(-)\n",
-  ">>> \n",
+  ">>>=20\n",
   ">>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\n",
   ">>> index 72f13f4..f9fa260 100644\n",
   ">>> --- a/arch/powerpc/kvm/booke.c\n",
   ">>> +++ b/arch/powerpc/kvm/booke.c\n",
   ">>> \@\@ -13,7 +13,7 \@\@\n",
-  ">>> * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,\n",
+  ">>> * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  =\n",
+  "02110-1301,\n",
   ">> USA.\n",
   ">>> *\n",
   ">>> * Copyright IBM Corp. 2007\n",
@@ -79,31 +81,39 @@
   ">>> *\n",
   ">>> * Authors: Hollis Blanchard <hollisb\@us.ibm.com>\n",
   ">>> *          Christian Ehrhardt <ehrhardt\@linux.vnet.ibm.com>\n",
-  ">>> \@\@ -1243,6 +1243,16 \@\@ void kvmppc_core_commit_memory_region(struct kvm\n",
+  ">>> \@\@ -1243,6 +1243,16 \@\@ void kvmppc_core_commit_memory_region(struct =\n",
+  "kvm\n",
   ">> *kvm,\n",
   ">>> {\n",
   ">>> }\n",
-  ">>> \n",
+  ">>>=20\n",
   ">>> +#ifdef CONFIG_64BIT\n",
   ">>> +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr)\n",
   ">>> +{\n",
-  ">>> +\tvcpu->arch.epcr = new_epcr;\n",
-  ">>> +\tvcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM;\n",
+  ">>> +\tvcpu->arch.epcr =3D new_epcr;\n",
+  ">>> +\tvcpu->arch.shadow_epcr &=3D ~SPRN_EPCR_GICM;\n",
   ">>> +\tif (vcpu->arch.epcr  & SPRN_EPCR_ICM)\n",
-  ">>> +\t\tvcpu->arch.shadow_epcr |= SPRN_EPCR_GICM;\n",
-  ">> \n",
-  ">> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too,\n",
+  ">>> +\t\tvcpu->arch.shadow_epcr |=3D SPRN_EPCR_GICM;\n",
+  ">>=20\n",
+  ">> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc =\n",
+  "too,\n",
   ">> no? Please only #ifdef the GICM bits out.\n",
-  "> \n",
-  "> kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc\n",
-  "> as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT,\n",
-  "> my assumption was that we will not support a virtual core with 64-bit category\n",
+  ">=20\n",
+  "> kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a =\n",
+  "virtual e500mc\n",
+  "> as detailed in patch's comment. All callers are also guarded by #ifdef =\n",
+  "CONFIG_64BIT,\n",
+  "> my assumption was that we will not support a virtual core with 64-bit =\n",
+  "category\n",
   "> on a 32-bit host.\n",
   "\n",
-  "My main concern is that every #ifdef potentially breaks things without us knowing. So the less #ifdef's we have, the better off we are. The spec only says that we don't _have_ to implement EPCR for non-hv non-64bit systems. It doesn't forbid to do so, right?\n",
+  "My main concern is that every #ifdef potentially breaks things without =\n",
+  "us knowing. So the less #ifdef's we have, the better off we are. The =\n",
+  "spec only says that we don't _have_ to implement EPCR for non-hv =\n",
+  "non-64bit systems. It doesn't forbid to do so, right?\n",
   "\n",
   "\n",
   "Alex"
 ]
 
-f23d4ce104a18f9ca366f6f36ce4a9a4618a545b9ca984dd5be2199ba8753480
+e82de800124184aa6f2a2f8a50403d112946a6b0fb35a70bd5b12f4cc1616d5b
