diff for duplicates of <1412375268.32313.48.camel@smoke>

diff --git a/a/1.txt b/N1/1.txt
index 3937028..1984fe9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On Fri, 2014-10-03 at 11:26 +0100, Mark Rutland wrote:
 
 Sure.
 
-> [mark@leverpostej:~/src/linux]% grep '[0-9][UL]' -- arch/arm64/include/asm/kvm_arm.h    
+> [mark at leverpostej:~/src/linux]% grep '[0-9][UL]' -- arch/arm64/include/asm/kvm_arm.h    
 > #define VTTBR_BADDR_MASK  (((1LLU << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)
 > #define VTTBR_VMID_SHIFT  (48LLU)
 > #define ESR_EL2_IL              (1U << 25)
@@ -16,10 +16,3 @@ The list is a bit longer if you look for hex numbers also, but I think
 I got them all.
 
 -Geoff
-
-
-
-_______________________________________________
-kexec mailing list
-kexec@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/kexec
diff --git a/a/content_digest b/N1/content_digest
index f89390c..8261159 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,10 @@
  "ref\0cover.1411604443.git.geoff@infradead.org\0"
  "ref\0490268c9dba3b6d3f5a52c7c1b0dd81686aac6f7.1411604443.git.geoff@infradead.org\0"
  "ref\020141003102641.GA26643@leverpostej\0"
- "From\0Geoff Levand <geoff@infradead.org>\0"
- "Subject\0Re: [PATCH 1/7] arm64/kvm: Fix assembler compatibility of macros\0"
+ "From\0geoff@infradead.org (Geoff Levand)\0"
+ "Subject\0[PATCH 1/7] arm64/kvm: Fix assembler compatibility of macros\0"
  "Date\0Fri, 03 Oct 2014 15:27:48 -0700\0"
- "To\0Mark Rutland <mark.rutland@arm.com>\0"
- "Cc\0Marc Zyngier <Marc.Zyngier@arm.com>"
-  Catalin Marinas <Catalin.Marinas@arm.com>
-  Will Deacon <Will.Deacon@arm.com>
-  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
-  kexec@lists.infradead.org <kexec@lists.infradead.org>
- " christoffer.dall@linaro.org <christoffer.dall@linaro.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, 2014-10-03 at 11:26 +0100, Mark Rutland wrote:\n"
@@ -19,7 +13,7 @@
  "\n"
  "Sure.\n"
  "\n"
- "> [mark@leverpostej:~/src/linux]% grep '[0-9][UL]' -- arch/arm64/include/asm/kvm_arm.h    \n"
+ "> [mark at leverpostej:~/src/linux]% grep '[0-9][UL]' -- arch/arm64/include/asm/kvm_arm.h    \n"
  "> #define VTTBR_BADDR_MASK  (((1LLU << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)\n"
  "> #define VTTBR_VMID_SHIFT  (48LLU)\n"
  "> #define ESR_EL2_IL              (1U << 25)\n"
@@ -30,13 +24,6 @@
  "The list is a bit longer if you look for hex numbers also, but I think\n"
  "I got them all.\n"
  "\n"
- "-Geoff\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ -Geoff
 
-1f69fa7f704aedaca93b9ef7c350e4374dc13f59494da8fe78b9d95555b4e843
+4c374850b2d62500f4706b568819a68ca87243e61691bcf4d0706d5972f2156b
