diff for duplicates of <20141210214100.GH30437@atomide.com> diff --git a/a/1.txt b/N1/1.txt index ecc174f..16ebd81 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -106,7 +106,7 @@ Tony > > + cxt->memtype); > > if (IS_ERR(cxt->przs[i])) { > > err = PTR_ERR(cxt->przs[i]); -> > dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", +> > dev_err(dev, "failed to request mem region (0x%zx at 0x%llx): %d\n", > > @@ -388,7 +395,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt, > > return -ENOMEM; > > } @@ -167,7 +167,7 @@ Tony > > + void *va; > > + > > if (!request_mem_region(start, size, "persistent_ram")) { -> > pr_err("request mem region (0x%llx@0x%llx) failed\n", +> > pr_err("request mem region (0x%llx at 0x%llx) failed\n", > > (unsigned long long)size, (unsigned long long)start); > > @@ -422,19 +429,24 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size) > > buffer_start_add = buffer_start_add_locked; diff --git a/a/content_digest b/N1/content_digest index 4f16323..aa78df6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,22 +3,10 @@ "ref\020140912231514.GB12379@n2100.arm.linux.org.uk\0" "ref\020140916205000.GA6672@atomide.com\0" "ref\0CAGXu5jLGQi+uA9oM7xRK98z2L81tLSfZE0S9eE7uUjxkCkeHDQ@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/2] pstore-ram: Allow optional mapping with pgprot_noncached\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/2] pstore-ram: Allow optional mapping with pgprot_noncached\0" "Date\0Wed, 10 Dec 2014 13:41:00 -0800\0" - "To\0Kees Cook <keescook@chromium.org>\0" - "Cc\0Tony Luck <tony.luck@intel.com>" - Russell King - ARM Linux <linux@arm.linux.org.uk> - Andrew Morton <akpm@linux-foundation.org> - LKML <linux-kernel@vger.kernel.org> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - Arnd Bergmann <arnd@arndb.de> - Rob Herring <robherring2@gmail.com> - Randy Dunlap <rdunlap@infradead.org> - Anton Vorontsov <anton@enomsg.org> - Colin Cross <ccross@android.com> - " Olof Johansson <olof@lixom.net>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Kees Cook <keescook@chromium.org> [141210 13:18]:\n" @@ -129,7 +117,7 @@ "> > + cxt->memtype);\n" "> > if (IS_ERR(cxt->przs[i])) {\n" "> > err = PTR_ERR(cxt->przs[i]);\n" - "> > dev_err(dev, \"failed to request mem region (0x%zx@0x%llx): %d\\n\",\n" + "> > dev_err(dev, \"failed to request mem region (0x%zx at 0x%llx): %d\\n\",\n" "> > @@ -388,7 +395,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,\n" "> > return -ENOMEM;\n" "> > }\n" @@ -190,7 +178,7 @@ "> > + void *va;\n" "> > +\n" "> > if (!request_mem_region(start, size, \"persistent_ram\")) {\n" - "> > pr_err(\"request mem region (0x%llx@0x%llx) failed\\n\",\n" + "> > pr_err(\"request mem region (0x%llx at 0x%llx) failed\\n\",\n" "> > (unsigned long long)size, (unsigned long long)start);\n" "> > @@ -422,19 +429,24 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size)\n" "> > buffer_start_add = buffer_start_add_locked;\n" @@ -267,4 +255,4 @@ "> Kees Cook\n" > Chrome OS Security -fde257167ba489a14f91b132bf248bc84ff09e3499679abf4fdbaadb31058410 +05874eecca88c5af89e117a04469c939cefdc7fb362c8d186d08166856c99899
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.