diff for duplicates of <20160401113040.GD20224@cbox>

diff --git a/a/1.txt b/N1/1.txt
index 5e4cf67..0b73e1b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,11 +6,11 @@ On Fri, Apr 01, 2016 at 12:12:22PM +0100, Will Deacon wrote:
 We should rewrite the kernel in python!
 
 > 
->  | 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))
 >  |   ^~
 > 
@@ -47,8 +47,4 @@ Thanks for the patch.
 >  }
 > -- 
 > 2.1.4
-> 
-_______________________________________________
-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 4a0a54b..b888017 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,12 +1,8 @@
  "ref\01459509142-13524-1-git-send-email-will.deacon@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 13:30:40 +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:12:22PM +0100, Will Deacon wrote:\n"
@@ -17,11 +13,11 @@
  "We should rewrite the kernel in python!\n"
  "\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"
@@ -58,10 +54,6 @@
  ">  }\n"
  "> -- \n"
  "> 2.1.4\n"
- "> \n"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
+ >
 
-d7fea921e03d3d94a97fb8ea7d8a0d73bfb0c8aa1e3c9105c874a372602a53be
+1aaeebd36a57adfd22b684eb7b30e0e3736d8490c187789341032ac9062261a8
