diff for duplicates of <20160401121034.GA22170@cbox>

diff --git a/a/1.txt b/N1/1.txt
index ba50901..5b08592 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,11 +21,11 @@ I wanted to have sent you and Catalin my Linux in EL2 patch set today,
 but it was still too messy and hacked up for that to be funny,
 unfortunately.
 
-> > >  | virt/kvm/arm/pmu.c: In function ‘kvm_pmu_overflow_status’:
+> > >  | virt/kvm/arm/pmu.c: In function ?kvm_pmu_overflow_status?:
 > > >  | virt/kvm/arm/pmu.c:198:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
 > > >  |    reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
 > > >  |    ^~~
-> > >  | arch/arm64/kvm/../../../virt/kvm/arm/pmu.c:196:2: note: ...this ‘if’ clause, but it is not
+> > >  | arch/arm64/kvm/../../../virt/kvm/arm/pmu.c:196:2: note: ...this ?if? clause, but it is not
 > > >  |   if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E))
 > > >  |   ^~
 > > > 
@@ -42,7 +42,3 @@ Yeah, I figure I will just add it to the next pull request, unless
 anyone objects to that.
 
 -Christoffer
-_______________________________________________
-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 cb2b421..47f90fb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,10 @@
  "ref\01459509142-13524-1-git-send-email-will.deacon@arm.com\0"
  "ref\020160401113040.GD20224@cbox\0"
  "ref\020160401113625.GC3604@arm.com\0"
- "From\0Christoffer Dall <christoffer.dall@linaro.org>\0"
- "Subject\0Re: [PATCH] arm64: KVM: Add braces to multi-line if statement in virtual PMU code\0"
+ "From\0christoffer.dall@linaro.org (Christoffer Dall)\0"
+ "Subject\0[PATCH] arm64: KVM: Add braces to multi-line if statement in virtual PMU code\0"
  "Date\0Fri, 1 Apr 2016 14:10:34 +0200\0"
- "To\0Will Deacon <will.deacon@arm.com>\0"
- "Cc\0marc.zyngier@arm.com"
-  kvmarm@lists.cs.columbia.edu
-  linux-arm-kernel@lists.infradead.org
- " shannon.zhao@linaro.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 01, 2016 at 12:36:25PM +0100, Will Deacon wrote:\n"
@@ -34,11 +30,11 @@
  "but it was still too messy and hacked up for that to be funny,\n"
  "unfortunately.\n"
  "\n"
- "> > >  | virt/kvm/arm/pmu.c: In function \342\200\230kvm_pmu_overflow_status\342\200\231:\n"
+ "> > >  | virt/kvm/arm/pmu.c: In function ?kvm_pmu_overflow_status?:\n"
  "> > >  | virt/kvm/arm/pmu.c:198:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]\n"
  "> > >  |    reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);\n"
  "> > >  |    ^~~\n"
- "> > >  | arch/arm64/kvm/../../../virt/kvm/arm/pmu.c:196:2: note: ...this \342\200\230if\342\200\231 clause, but it is not\n"
+ "> > >  | arch/arm64/kvm/../../../virt/kvm/arm/pmu.c:196:2: note: ...this ?if? clause, but it is not\n"
  "> > >  |   if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E))\n"
  "> > >  |   ^~\n"
  "> > > \n"
@@ -54,10 +50,6 @@
  "Yeah, I figure I will just add it to the next pull request, unless\n"
  "anyone objects to that.\n"
  "\n"
- "-Christoffer\n"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ -Christoffer
 
-19f6c0842231550e6ab13f111fc0ac98519c16888fe9400654d65f4ff2075a35
+080fe2b7ad764fd4f442051dd43efc3813bd2d43ac4e4443c7cf138bd78fa698
