diff for duplicates of <20160719132736.GB21007@leverpostej>

diff --git a/a/1.txt b/N1/1.txt
index b8ac57f..5d886a7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,32 +12,32 @@ On Tue, Jul 19, 2016 at 08:48:57AM -0400, Mark Salter 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
@@ -59,8 +59,3 @@ phys_addr_t __init memblock_try_alloc(phys_addr_t size, phys_addr_t align)
 
 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 b44c02d..e86895d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,23 +4,10 @@
  "ref\020160719102815.GE20774@linaro.org\0"
  "ref\020160719104103.GB20990@arm.com\0"
  "ref\01468932537.27473.6.camel@redhat.com\0"
- "From\0Mark Rutland <mark.rutland@arm.com>\0"
- "Subject\0Re: [PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel\0"
+ "From\0mark.rutland@arm.com (Mark Rutland)\0"
+ "Subject\0[PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel\0"
  "Date\0Tue, 19 Jul 2016 14:27:54 +0100\0"
- "To\0Mark Salter <msalter@redhat.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
-  bauerman@linux.vnet.ibm.com
-  Dennis Chen <dennis.chen@arm.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 08:48:57AM -0400, Mark Salter wrote:\n"
@@ -37,32 +24,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"
@@ -83,11 +70,6 @@
  "}\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.
 
-ce0cf2e4c58edcc15888acb059297eb9707574085b45682250d8207d4b4814bf
+e352204399fe7920731f1ffc02fad9ab705a000aac487bd8fc21f681d3e53858
