diff for duplicates of <20150720120040.GC19239@leverpostej> diff --git a/a/content_digest b/N1/content_digest index 92d9c9f..e771687 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -23,7 +23,7 @@ hch@lst.de <hch@lst.de> linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> will.deacon@arm.com - " catalin.marinas\0" + " catalin.marinas@arm.com\0" "\00:1\0" "b\0" "Hi,\n" @@ -220,4 +220,4 @@ "Thanks,\n" Mark. -5e8000baf3a2ae8a996d1598bac463700ea22380786d8b437b4ffb136919fe62 +d6a70684a8947d465e94b5dcd96c3360c9e71b931d931b826276a2b7bb20f4ae
diff --git a/a/1.txt b/N2/1.txt index 4f85440..354cc7a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -65,12 +65,12 @@ they updated here, so this patch breaks the build for arm64. memmap.phys_map is a void*, so we need to retain a cast to a numeric type or we'll get splats like: -arch/arm64/kernel/efi.c: In function ‘arm64_enable_runtime_services’: -arch/arm64/kernel/efi.c:294:24: warning: passing argument 1 of ‘memremap’ makes integer from pointer without a cast +arch/arm64/kernel/efi.c: In function ?arm64_enable_runtime_services?: +arch/arm64/kernel/efi.c:294:24: warning: passing argument 1 of ?memremap? makes integer from pointer without a cast memmap.map = memremap(memmap.phys_map, mapsize, MEMREMAP_CACHE); ^ In file included from arch/arm64/kernel/efi.c:18:0: -include/linux/io.h:203:14: note: expected ‘resource_size_t’ but argument is of type ‘void *’ +include/linux/io.h:203:14: note: expected ?resource_size_t? but argument is of type ?void *? extern void *memremap(resource_size_t offset, size_t size, unsigned long flags); ^ Unfortunately, even with that fixed this patch breaks boot due to the diff --git a/a/content_digest b/N2/content_digest index 92d9c9f..636ba40 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,9 @@ "ref\020150720001614.30857.89063.stgit@dwillia2-desk3.amr.corp.intel.com\0" "ref\020150720001822.30857.65670.stgit@dwillia2-desk3.amr.corp.intel.com\0" - "From\0Mark Rutland <mark.rutland@arm.com>\0" - "Subject\0Re: [PATCH 09/10] arch: introduce memremap()\0" + "From\0mark.rutland@arm.com (Mark Rutland)\0" + "Subject\0[PATCH 09/10] arch: introduce memremap()\0" "Date\0Mon, 20 Jul 2015 13:00:41 +0100\0" - "To\0Dan Williams <dan.j.williams@intel.com>\0" - "Cc\0tglx@linutronix.de <tglx@linutronix.de>" - mingo@kernel.org <mingo@kernel.org> - hpa@zytor.com <hpa@zytor.com> - linux-arch@vger.kernel.org <linux-arch@vger.kernel.org> - tony.luck@intel.com <tony.luck@intel.com> - linux@arm.linux.org.uk <linux@arm.linux.org.uk> - arnd@arndb.de <arnd@arndb.de> - benh@kernel.crashing.org <benh@kernel.crashing.org> - mcgrof@suse.com <mcgrof@suse.com> - x86@kernel.org <x86@kernel.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - ralf@linux-mips.org <ralf@linux-mips.org> - Andy Shevchenko <andy.shevchenko@gmail.com> - geert@linux-m68k.org <geert@linux-m68k.org> - toshi.kani@hp.com <toshi.kani@hp.com> - ross.zwisler@linux.intel.com <ross.zwisler@linux.intel.com> - hch@lst.de <hch@lst.de> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - will.deacon@arm.com - " catalin.marinas\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -93,12 +73,12 @@ "memmap.phys_map is a void*, so we need to retain a cast to a numeric type or\n" "we'll get splats like:\n" "\n" - "arch/arm64/kernel/efi.c: In function \342\200\230arm64_enable_runtime_services\342\200\231:\n" - "arch/arm64/kernel/efi.c:294:24: warning: passing argument 1 of \342\200\230memremap\342\200\231 makes integer from pointer without a cast\n" + "arch/arm64/kernel/efi.c: In function ?arm64_enable_runtime_services?:\n" + "arch/arm64/kernel/efi.c:294:24: warning: passing argument 1 of ?memremap? makes integer from pointer without a cast\n" " memmap.map = memremap(memmap.phys_map, mapsize, MEMREMAP_CACHE);\n" " ^\n" "In file included from arch/arm64/kernel/efi.c:18:0:\n" - "include/linux/io.h:203:14: note: expected \342\200\230resource_size_t\342\200\231 but argument is of type \342\200\230void *\342\200\231\n" + "include/linux/io.h:203:14: note: expected ?resource_size_t? but argument is of type ?void *?\n" " extern void *memremap(resource_size_t offset, size_t size, unsigned long flags);\n" " ^\n" "Unfortunately, even with that fixed this patch breaks boot due to the\n" @@ -220,4 +200,4 @@ "Thanks,\n" Mark. -5e8000baf3a2ae8a996d1598bac463700ea22380786d8b437b4ffb136919fe62 +e809edf72663841d05320cf5bd5166ddb26dd56a102478dccb256fc29f8a2616
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.