diff for duplicates of <20141106152830.GF23706@leverpostej>

diff --git a/a/1.txt b/N1/1.txt
index 20ecff3..c44d1c8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -60,7 +60,7 @@ On Thu, Nov 06, 2014 at 12:16:12PM +0000, Arun Chandran wrote:
 > 
 > KVM also disabled.
 > 
-> /root@genericarmv8:~# usr/local/sbin/kexec --lite -l vmlinux
+> /root at genericarmv8:~# usr/local/sbin/kexec --lite -l vmlinux
 > --dtb=apm-mustang.dtb --command-line=
 > "root=/dev/nfs rw
 > nfsroot=10.162.103.145:/nfs_root/linaro-image-lamp-genericarmv8,nfsvers=3
@@ -104,37 +104,37 @@ On Thu, Nov 06, 2014 at 12:16:12PM +0000, Arun Chandran wrote:
 > earlyprintk=uart8250-32bit,0x1c020000
 > Unable to find /proc/device-tree//chosen/linux,stdout-path, printing
 > from purgatory is diabled
-> read_cpu_info: dtb_1 cpu-0 (/cpus/cpu@000): hwid-0, 'spin-table',
+> read_cpu_info: dtb_1 cpu-0 (/cpus/cpu at 000): hwid-0, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-1 (/cpus/cpu@001): hwid-1, 'spin-table',
+> read_cpu_info: dtb_1 cpu-1 (/cpus/cpu at 001): hwid-1, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-2 (/cpus/cpu@100): hwid-100, 'spin-table',
+> read_cpu_info: dtb_1 cpu-2 (/cpus/cpu at 100): hwid-100, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-3 (/cpus/cpu@101): hwid-101, 'spin-table',
+> read_cpu_info: dtb_1 cpu-3 (/cpus/cpu at 101): hwid-101, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-4 (/cpus/cpu@200): hwid-200, 'spin-table',
+> read_cpu_info: dtb_1 cpu-4 (/cpus/cpu at 200): hwid-200, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-5 (/cpus/cpu@201): hwid-201, 'spin-table',
+> read_cpu_info: dtb_1 cpu-5 (/cpus/cpu at 201): hwid-201, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-6 (/cpus/cpu@300): hwid-300, 'spin-table',
+> read_cpu_info: dtb_1 cpu-6 (/cpus/cpu at 300): hwid-300, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_1 cpu-7 (/cpus/cpu@301): hwid-301, 'spin-table',
+> read_cpu_info: dtb_1 cpu-7 (/cpus/cpu at 301): hwid-301, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-0 (/cpus/cpu@000): hwid-0, 'spin-table',
+> read_cpu_info: dtb_2 cpu-0 (/cpus/cpu at 000): hwid-0, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-1 (/cpus/cpu@001): hwid-1, 'spin-table',
+> read_cpu_info: dtb_2 cpu-1 (/cpus/cpu at 001): hwid-1, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-2 (/cpus/cpu@100): hwid-100, 'spin-table',
+> read_cpu_info: dtb_2 cpu-2 (/cpus/cpu at 100): hwid-100, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-3 (/cpus/cpu@101): hwid-101, 'spin-table',
+> read_cpu_info: dtb_2 cpu-3 (/cpus/cpu at 101): hwid-101, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-4 (/cpus/cpu@200): hwid-200, 'spin-table',
+> read_cpu_info: dtb_2 cpu-4 (/cpus/cpu at 200): hwid-200, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-5 (/cpus/cpu@201): hwid-201, 'spin-table',
+> read_cpu_info: dtb_2 cpu-5 (/cpus/cpu at 201): hwid-201, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-6 (/cpus/cpu@300): hwid-300, 'spin-table',
+> read_cpu_info: dtb_2 cpu-6 (/cpus/cpu at 300): hwid-300, 'spin-table',
 > cpu-release-addr 400000fff8
-> read_cpu_info: dtb_2 cpu-7 (/cpus/cpu@301): hwid-301, 'spin-table',
+> read_cpu_info: dtb_2 cpu-7 (/cpus/cpu at 301): hwid-301, 'spin-table',
 > cpu-release-addr 400000fff8
 > check_cpu_properties: hwid-0: OK
 > check_cpu_properties: hwid-1: OK
@@ -158,7 +158,7 @@ On Thu, Nov 06, 2014 at 12:16:12PM +0000, Arun Chandran wrote:
 > segment[1].mem   = 0x4000700000
 > segment[1].memsz = 0x3000
 > 
-> root@genericarmv8:~# /usr/local/sbin/kexec --lite -e
+> root at genericarmv8:~# /usr/local/sbin/kexec --lite -e
 > kexec version: 14.10.21.16.36-ga38e0a6
 > arch_process_options:85: command_line: (null)
 > arch_process_options:87: initrd: (null)
@@ -182,8 +182,3 @@ Can you figure out what this corresponds to in your kernel image?
 
 Thanks,
 Mark.
-
-_______________________________________________
-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 5fb7640..ab3b644 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,9 @@
  "ref\0cover.1414099246.git.geoff@infradead.org\0"
  "ref\0CAFdej01qZMr3CgBv6jOuXHod2F8zHg89yDA8FA4m65bFEn+vYw@mail.gmail.com\0"
- "From\0Mark Rutland <mark.rutland@arm.com>\0"
- "Subject\0Re: [PATCH 00/10] arm64 kexec kernel patches V5\0"
+ "From\0mark.rutland@arm.com (Mark Rutland)\0"
+ "Subject\0[PATCH 00/10] arm64 kexec kernel patches V5\0"
  "Date\0Thu, 6 Nov 2014 15:28:30 +0000\0"
- "To\0Arun Chandran <achandran@mvista.com>\0"
- "Cc\0Geoff Levand <geoff@infradead.org>"
-  Catalin Marinas <Catalin.Marinas@arm.com>
-  Will Deacon <Will.Deacon@arm.com>
-  Marc Zyngier <Marc.Zyngier@arm.com>
-  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
-  grant.likely@linaro.org <grant.likely@linaro.org>
-  kexec@lists.infradead.org <kexec@lists.infradead.org>
- " Christoffer Dall <christoffer.dall@linaro.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Nov 06, 2014 at 12:16:12PM +0000, Arun Chandran wrote:\n"
@@ -76,7 +68,7 @@
  "> \n"
  "> KVM also disabled.\n"
  "> \n"
- "> /root@genericarmv8:~# usr/local/sbin/kexec --lite -l vmlinux\n"
+ "> /root at genericarmv8:~# usr/local/sbin/kexec --lite -l vmlinux\n"
  "> --dtb=apm-mustang.dtb --command-line=\n"
  "> \"root=/dev/nfs rw\n"
  "> nfsroot=10.162.103.145:/nfs_root/linaro-image-lamp-genericarmv8,nfsvers=3\n"
@@ -120,37 +112,37 @@
  "> earlyprintk=uart8250-32bit,0x1c020000\n"
  "> Unable to find /proc/device-tree//chosen/linux,stdout-path, printing\n"
  "> from purgatory is diabled\n"
- "> read_cpu_info: dtb_1 cpu-0 (/cpus/cpu@000): hwid-0, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-0 (/cpus/cpu at 000): hwid-0, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-1 (/cpus/cpu@001): hwid-1, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-1 (/cpus/cpu at 001): hwid-1, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-2 (/cpus/cpu@100): hwid-100, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-2 (/cpus/cpu at 100): hwid-100, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-3 (/cpus/cpu@101): hwid-101, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-3 (/cpus/cpu at 101): hwid-101, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-4 (/cpus/cpu@200): hwid-200, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-4 (/cpus/cpu at 200): hwid-200, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-5 (/cpus/cpu@201): hwid-201, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-5 (/cpus/cpu at 201): hwid-201, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-6 (/cpus/cpu@300): hwid-300, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-6 (/cpus/cpu at 300): hwid-300, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_1 cpu-7 (/cpus/cpu@301): hwid-301, 'spin-table',\n"
+ "> read_cpu_info: dtb_1 cpu-7 (/cpus/cpu at 301): hwid-301, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-0 (/cpus/cpu@000): hwid-0, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-0 (/cpus/cpu at 000): hwid-0, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-1 (/cpus/cpu@001): hwid-1, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-1 (/cpus/cpu at 001): hwid-1, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-2 (/cpus/cpu@100): hwid-100, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-2 (/cpus/cpu at 100): hwid-100, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-3 (/cpus/cpu@101): hwid-101, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-3 (/cpus/cpu at 101): hwid-101, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-4 (/cpus/cpu@200): hwid-200, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-4 (/cpus/cpu at 200): hwid-200, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-5 (/cpus/cpu@201): hwid-201, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-5 (/cpus/cpu at 201): hwid-201, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-6 (/cpus/cpu@300): hwid-300, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-6 (/cpus/cpu at 300): hwid-300, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
- "> read_cpu_info: dtb_2 cpu-7 (/cpus/cpu@301): hwid-301, 'spin-table',\n"
+ "> read_cpu_info: dtb_2 cpu-7 (/cpus/cpu at 301): hwid-301, 'spin-table',\n"
  "> cpu-release-addr 400000fff8\n"
  "> check_cpu_properties: hwid-0: OK\n"
  "> check_cpu_properties: hwid-1: OK\n"
@@ -174,7 +166,7 @@
  "> segment[1].mem   = 0x4000700000\n"
  "> segment[1].memsz = 0x3000\n"
  "> \n"
- "> root@genericarmv8:~# /usr/local/sbin/kexec --lite -e\n"
+ "> root at genericarmv8:~# /usr/local/sbin/kexec --lite -e\n"
  "> kexec version: 14.10.21.16.36-ga38e0a6\n"
  "> arch_process_options:85: command_line: (null)\n"
  "> arch_process_options:87: initrd: (null)\n"
@@ -197,11 +189,6 @@
  "Can you figure out what this corresponds to in your kernel image?\n"
  "\n"
  "Thanks,\n"
- "Mark.\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ Mark.
 
-c5a6c7138e0fc9969d19d195cd9321ff351749863a797a77c157784994a4a31c
+4aa0f79abec0b2542993f01d7bbe5feec34167a405b72eb837f3260ddbb8c15e
