diff for duplicates of <1548057848-15136-18-git-send-email-rppt@linux.ibm.com>
diff --git a/a/1.txt b/N1/1.txt
index b8dac14..1fddeda 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
diff --git a/a/content_digest b/N1/content_digest
index f3ea28c..ce52db7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,60 +8,60 @@
"Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
+ " David S. Miller <davem\@davemloft.net>",
+ " Dennis Zhou <dennis\@kernel.org>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
+ " Greentime Hu <green.hu\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ " Guan Xuetao <gxt\@pku.edu.cn>",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
" Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
" Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
+ " Michal Simek <monstr\@monstr.eu>",
+ " Paul Burton <paul.burton\@mips.com>",
" Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
" Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
+ " Russell King <linux\@armlinux.org.uk>",
" Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
" Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
+ " Yoshinori Sato <ysato\@users.sourceforge.jp>",
+ " devicetree\@vger.kernel.org",
+ " kasan-dev\@googlegroups.com",
+ " linux-alpha\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-c6x-dev\@linux-c6x.org",
+ " linux-ia64\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-m68k\@lists.linux-m68k.org",
+ " linux-mips\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-um\@lists.infradead.org",
+ " linux-usb\@vger.kernel.org",
+ " linux-xtensa\@linux-xtensa.org",
" linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " openrisc\@lists.librecores.org",
+ " sparclinux\@vger.kernel.org",
+ " uclinux-h8-devel\@lists.sourceforge.jp",
+ " x86\@kernel.org",
+ " xen-devel\@lists.xenproject.org",
+ " Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
"\0000:1\0"
@@ -89,8 +89,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -129,4 +131,4 @@
"2.7.4"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+c758414affbcc37d73e96001cb56d9a750a7c4c8285cd7311cbb43d2c787b6bd
diff --git a/a/1.txt b/N2/1.txt
index b8dac14..d01540c 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
@@ -54,4 +56,10 @@ index a56f65a..d58a365 100644
list_add(&entry->next, &blacklisted_initcalls);
}
--
-2.7.4
\ No newline at end of file
+2.7.4
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index f3ea28c..e96f9a6 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
@@ -89,8 +89,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -126,7 +128,13 @@
" \t\t\tlist_add(&entry->next, &blacklisted_initcalls);\n",
" \t\t}\n",
"-- \n",
- "2.7.4"
+ "2.7.4\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+40f2ec4bc43432cf8d478aad3e674dda27f5e306c09a8e33dbf926243b64bcc7
diff --git a/a/1.txt b/N3/1.txt
index b8dac14..1fddeda 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
diff --git a/a/content_digest b/N3/content_digest
index f3ea28c..520c2af 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,60 +8,33 @@
"Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
+ " David S. Miller <davem\@davemloft.net>",
" Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
+ " Geert Uytterhoeven <geert\@linux-m68k.org>",
" Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
" Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
+ " Mark Salter <msalter\@redhat.com>",
+ " Matt Turner <mattst88\@gmail.com>",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
" Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
" Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " Petr Mladek <pmladek\@suse.com>",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
+ " Rob Herring <robh+d>\0"
]
[
"\0000:1\0"
@@ -89,8 +62,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -129,4 +104,4 @@
"2.7.4"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+205f298f75ce3a92bc8b2cef60c3e76fc22512a2256027e0dfe92e848a55e51f
diff --git a/a/1.txt b/N4/1.txt
index b8dac14..a6066e6 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
@@ -52,6 +54,4 @@ index a56f65a..d58a365 100644
+ __func__, strlen(str_entry) + 1);
strcpy(entry->buf, str_entry);
list_add(&entry->next, &blacklisted_initcalls);
- }
---
-2.7.4
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/a/content_digest b/N4/content_digest
index f3ea28c..071252f 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,67 +1,64 @@
-[
- "ref\0001548057848-15136-1-git-send-email-rppt\@linux.ibm.com\0"
-]
[
"From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
- "Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
+ "Subject\0[v2,17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
+ " David S. Miller <davem\@davemloft.net>",
+ " Dennis Zhou <dennis\@kernel.org>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
+ " Greentime Hu <green.hu\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ " Guan Xuetao <gxt\@pku.edu.cn>",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
" Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
" Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
+ " Michal Simek <monstr\@monstr.eu>",
+ " Paul Burton <paul.burton\@mips.com>",
" Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
" Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
+ " Russell King <linux\@armlinux.org.uk>",
" Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
" Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
+ " Yoshinori Sato <ysato\@users.sourceforge.jp>",
+ " devicetree\@vger.kernel.org",
+ " kasan-dev\@googlegroups.com",
+ " linux-alpha\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-c6x-dev\@linux-c6x.org",
+ " linux-ia64\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-m68k\@lists.linux-m68k.org",
+ " linux-mips\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-um\@lists.infradead.org",
+ " linux-usb\@vger.kernel.org",
+ " linux-xtensa\@linux-xtensa.org",
" linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " openrisc\@lists.librecores.org",
+ " sparclinux\@vger.kernel.org",
+ " uclinux-h8-devel\@lists.sourceforge.jp",
+ " x86\@kernel.org",
+ " xen-devel\@lists.xenproject.org",
+ " Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
"\0000:1\0"
@@ -89,8 +86,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -124,9 +123,7 @@
"+\t\t\t\t __func__, strlen(str_entry) + 1);\n",
" \t\t\tstrcpy(entry->buf, str_entry);\n",
" \t\t\tlist_add(&entry->next, &blacklisted_initcalls);\n",
- " \t\t}\n",
- "-- \n",
- "2.7.4"
+ " \t\t}"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+a1db066e9594b29011d003c021f70e5eddf17ffed90cd8a1bc5901cae3c54f67
diff --git a/a/1.txt b/N5/1.txt
index b8dac14..1fddeda 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
diff --git a/a/content_digest b/N5/content_digest
index f3ea28c..0313bf6 100644
--- a/a/content_digest
+++ b/N5/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
@@ -57,7 +57,6 @@
" linux-kernel\@vger.kernel.org",
" Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
" Andrew Morton <akpm\@linux-foundation.org>",
" linuxppc-dev\@lists.ozlabs.org",
" David S. Miller <davem\@davemloft.net>",
@@ -89,8 +88,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -129,4 +130,4 @@
"2.7.4"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+db47480e280056cd74079cdc44dfabc2117813ff7f23dee4420b1b55ddf233b9
diff --git a/a/1.txt b/N6/1.txt
index b8dac14..7a64584 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -4,7 +4,7 @@ The panic() format duplicates the one used by memblock itself and in order
to avoid explosion with long parameters list replace open coded allocation
size calculations with a local variable.
-Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
+Signed-off-by: Mike Rapoport <rppt at linux.ibm.com>
---
init/main.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
diff --git a/a/content_digest b/N6/content_digest
index f3ea28c..74cd5ca 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -2,66 +2,16 @@
"ref\0001548057848-15136-1-git-send-email-rppt\@linux.ibm.com\0"
]
[
- "From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
+ "From\0rppt\@linux.ibm.com (Mike Rapoport)\0"
]
[
"Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
- "To\0linux-mm\@kvack.org\0"
-]
-[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
- " Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ "To\0linux-snps-arc\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -76,7 +26,7 @@
"to avoid explosion with long parameters list replace open coded allocation\n",
"size calculations with a local variable.\n",
"\n",
- "Signed-off-by: Mike Rapoport <rppt\@linux.ibm.com>\n",
+ "Signed-off-by: Mike Rapoport <rppt at linux.ibm.com>\n",
"---\n",
" init/main.c | 26 ++++++++++++++++++++------\n",
" 1 file changed, 20 insertions(+), 6 deletions(-)\n",
@@ -89,8 +39,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -129,4 +81,4 @@
"2.7.4"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+caab073c4a8a095b999c4a3f7be3e27ccf56adf6d1e22506b430d01fd294f22f
diff --git a/a/1.txt b/N7/1.txt
index b8dac14..1fddeda 100644
--- a/a/1.txt
+++ b/N7/1.txt
@@ -17,8 +17,10 @@ index a56f65a..d58a365 100644
*/
static void __init setup_command_line(char *command_line)
{
-- saved_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-- initcall_command_line - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- saved_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
+- initcall_command_line =
+- memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
- static_command_line = memblock_alloc(strlen(command_line) + 1,
- SMP_CACHE_BYTES);
+ size_t len = strlen(boot_command_line) + 1;
diff --git a/a/content_digest b/N7/content_digest
index f3ea28c..f62a823 100644
--- a/a/content_digest
+++ b/N7/content_digest
@@ -5,63 +5,13 @@
"From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
- "Subject\0[PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
+ "Subject\0[OpenRISC] [PATCH v2 17/21] init/main: add checks for the return value of memblock_alloc*()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:04:04 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:04:04 +0200\0"
]
[
- "To\0linux-mm\@kvack.org\0"
-]
-[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
- " Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ "To\0openrisc\@lists.librecores.org\0"
]
[
"\0000:1\0"
@@ -89,8 +39,10 @@
" */\n",
" static void __init setup_command_line(char *command_line)\n",
" {\n",
- "-\tsaved_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
- "-\tinitcall_command_line -\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tsaved_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
+ "-\tinitcall_command_line =\n",
+ "-\t\tmemblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);\n",
"-\tstatic_command_line = memblock_alloc(strlen(command_line) + 1,\n",
"-\t\t\t\t\t SMP_CACHE_BYTES);\n",
"+\tsize_t len = strlen(boot_command_line) + 1;\n",
@@ -129,4 +81,4 @@
"2.7.4"
]
-2c0d7e800e2540c67e61a3335e669df528d6a32b3bfc65c853eded4a483db8ac
+2f8ac3da1866a54dd7ff295ab61b5626a88fb65dcb4bec57112bf2c6d5784757
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.