diff for duplicates of <20160720034838.GB30575@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 471d722..4664c1e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,32 +13,32 @@ On Tue, Jul 19, 2016 at 02:27:54PM +0100, Mark Rutland wrote:
 > > > > > > + */
 > > > > > > +static void __init reserve_crashkernel(void)
 > > > > > > +{
-> > > > > > +     int ret;
+> > > > > > +?????int ret;
 > > > > > > +
-> > > > > > +     ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
-> > > > > > +                             &crash_size, &crash_base);
-> > > > > > +     /* no crashkernel= or invalid value specified */
-> > > > > > +     if (ret || !crash_size)
-> > > > > > +             return;
+> > > > > > +?????ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
+> > > > > > +?????????????????????????????&crash_size, &crash_base);
+> > > > > > +?????/* no crashkernel= or invalid value specified */
+> > > > > > +?????if (ret || !crash_size)
+> > > > > > +?????????????return;
 > > > > > > +
-> > > > > > +     if (crash_base == 0) {
-> > > > > > +             /* Current arm64 boot protocol requires 2MB alignment */
-> > > > > > +             crash_base = memblock_find_in_range(0,
-> > > > > > +                             MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M);
-> > > > > > +             if (crash_base == 0) {
-> > > > > > +                     pr_warn("Unable to allocate crashkernel (size:%llx)\n",
-> > > > > > +                             crash_size);
-> > > > > > +                     return;
-> > > > > > +             }
-> > > > > > +             memblock_reserve(crash_base, crash_size);
+> > > > > > +?????if (crash_base == 0) {
+> > > > > > +?????????????/* Current arm64 boot protocol requires 2MB alignment */
+> > > > > > +?????????????crash_base = memblock_find_in_range(0,
+> > > > > > +?????????????????????????????MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M);
+> > > > > > +?????????????if (crash_base == 0) {
+> > > > > > +?????????????????????pr_warn("Unable to allocate crashkernel (size:%llx)\n",
+> > > > > > +?????????????????????????????crash_size);
+> > > > > > +?????????????????????return;
+> > > > > > +?????????????}
+> > > > > > +?????????????memblock_reserve(crash_base, crash_size);
 > > > > > > 
 > > > > > I am not pretty sure the context here, but
 > > > > > can we use below code piece instead of the above lines?
-> > > > >         if (crash_base == 0)
-> > > > >                 memblock_alloc(crash_size, SZ_2M);
+> > > > > ????????if (crash_base == 0)
+> > > > > ????????????????memblock_alloc(crash_size, SZ_2M);
 > > > > Either would be fine here.
 > > > > 
-> > > Hello AKASHI, maybe you can succeed to find the base with memblock_find_in_range(), 
+> > > Hello AKASHI, maybe you can succeed to find the base with memblock_find_in_range(),?
 > > > but that doesn't mean you will also succeed to reserve them with memblock_reserve followed.
 > > 
 > > We avoid memblock_alloc() here because it panics on failure. This could happen
@@ -68,10 +68,4 @@ Dennis
 > 
 > 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 1971c8f..19d5a89 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,23 +5,10 @@
  "ref\020160719104103.GB20990@arm.com\0"
  "ref\01468932537.27473.6.camel@redhat.com\0"
  "ref\020160719132736.GB21007@leverpostej\0"
- "From\0Dennis Chen <dennis.chen@arm.com>\0"
- "Subject\0Re: [PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel\0"
+ "From\0dennis.chen@arm.com (Dennis Chen)\0"
+ "Subject\0[PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel\0"
  "Date\0Wed, 20 Jul 2016 11:48:40 +0800\0"
- "To\0Mark Rutland <mark.rutland@arm.com>\0"
- "Cc\0Pratyush Anand <panand@redhat.com>"
-  geoff@infradead.org
-  catalin.marinas@arm.com
-  will.deacon@arm.com
-  AKASHI Takahiro <takahiro.akashi@linaro.org>
-  robh+dt@kernel.org
-  james.morse@arm.com
-  Mark Salter <msalter@redhat.com>
-  bauerman@linux.vnet.ibm.com
-  nd@arm.com
-  dyoung@redhat.com
-  kexec@lists.infradead.org
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, Jul 19, 2016 at 02:27:54PM +0100, Mark Rutland wrote:\n"
@@ -39,32 +26,32 @@
  "> > > > > > + */\n"
  "> > > > > > +static void __init reserve_crashkernel(void)\n"
  "> > > > > > +{\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240int ret;\n"
+ "> > > > > > +?????int ret;\n"
  "> > > > > > +\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240&crash_size, &crash_base);\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240/* no crashkernel= or invalid value specified */\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240if (ret || !crash_size)\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return;\n"
+ "> > > > > > +?????ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),\n"
+ "> > > > > > +?????????????????????????????&crash_size, &crash_base);\n"
+ "> > > > > > +?????/* no crashkernel= or invalid value specified */\n"
+ "> > > > > > +?????if (ret || !crash_size)\n"
+ "> > > > > > +?????????????return;\n"
  "> > > > > > +\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240if (crash_base == 0) {\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240/* Current arm64 boot protocol requires 2MB alignment */\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240crash_base = memblock_find_in_range(0,\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M);\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (crash_base == 0) {\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240pr_warn(\"Unable to allocate crashkernel (size:%llx)\\n\",\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240crash_size);\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return;\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n"
- "> > > > > > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240memblock_reserve(crash_base, crash_size);\n"
+ "> > > > > > +?????if (crash_base == 0) {\n"
+ "> > > > > > +?????????????/* Current arm64 boot protocol requires 2MB alignment */\n"
+ "> > > > > > +?????????????crash_base = memblock_find_in_range(0,\n"
+ "> > > > > > +?????????????????????????????MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M);\n"
+ "> > > > > > +?????????????if (crash_base == 0) {\n"
+ "> > > > > > +?????????????????????pr_warn(\"Unable to allocate crashkernel (size:%llx)\\n\",\n"
+ "> > > > > > +?????????????????????????????crash_size);\n"
+ "> > > > > > +?????????????????????return;\n"
+ "> > > > > > +?????????????}\n"
+ "> > > > > > +?????????????memblock_reserve(crash_base, crash_size);\n"
  "> > > > > > \n"
  "> > > > > I am not pretty sure the context here, but\n"
  "> > > > > can we use below code piece instead of the above lines?\n"
- "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (crash_base == 0)\n"
- "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240memblock_alloc(crash_size, SZ_2M);\n"
+ "> > > > > ????????if (crash_base == 0)\n"
+ "> > > > > ????????????????memblock_alloc(crash_size, SZ_2M);\n"
  "> > > > Either would be fine here.\n"
  "> > > > \n"
- "> > > Hello AKASHI, maybe you can succeed to find the base with memblock_find_in_range(),\302\240\n"
+ "> > > Hello AKASHI, maybe you can succeed to find the base with memblock_find_in_range(),?\n"
  "> > > but that doesn't mean you will also succeed to reserve them with memblock_reserve followed.\n"
  "> > \n"
  "> > We avoid memblock_alloc() here because it panics on failure. This could happen\n"
@@ -94,12 +81,6 @@
  "> \n"
  "> Thanks,\n"
  "> Mark.\n"
- "> \n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ >
 
-6fe0d43e59ba9fa1ad1888477a8ad3e0b563a068c8b062bc04000b2a5f661791
+f2378cfb7aeb6797ff23e59172376aabfadef24d313cb0d370c12935d609e317
