diff for duplicates of <20160401113625.GC3604@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 79bcfbe..0e66b62 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,11 +12,11 @@ https://mail.python.org/pipermail/python-list/2004-October/283327.html
 
 but, today's certainly the day for whacky suggestions.
 
-> >  | 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))
 > >  |   ^~
 > > 
@@ -30,7 +30,3 @@ but, today's certainly the day for whacky suggestions.
 No problem. I timed it nicely with your pull request.
 
 Will
-_______________________________________________
-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 063a3bd..aafe7c0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,9 @@
  "ref\01459509142-13524-1-git-send-email-will.deacon@arm.com\0"
  "ref\020160401113040.GD20224@cbox\0"
- "From\0Will Deacon <will.deacon@arm.com>\0"
- "Subject\0Re: [PATCH] arm64: KVM: Add braces to multi-line if statement in virtual PMU code\0"
+ "From\0will.deacon@arm.com (Will Deacon)\0"
+ "Subject\0[PATCH] arm64: KVM: Add braces to multi-line if statement in virtual PMU code\0"
  "Date\0Fri, 1 Apr 2016 12:36:25 +0100\0"
- "To\0Christoffer Dall <christoffer.dall@linaro.org>\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 01:30:40PM +0200, Christoffer Dall wrote:\n"
@@ -24,11 +20,11 @@
  "\n"
  "but, today's certainly the day for whacky suggestions.\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"
@@ -41,10 +37,6 @@
  "\n"
  "No problem. I timed it nicely with your pull request.\n"
  "\n"
- "Will\n"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ Will
 
-983f8376487e9678d7151bc4500338bfeb7e176619c8bae4f9d18490413cf363
+ecfe9a7fec770846fb5683ae8eb5fff7f56baa3135d0c50960ae49af6b09018d
