diff for duplicates of <20151218161836.GL3729@pathway.suse.cz> diff --git a/a/1.txt b/N1/1.txt index adb466b..cd39466 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,3 +25,67 @@ On Thu 2015-12-17 14:38:58, Andrew Morton wrote: Please, find the follow up patch below. I guess that you will want to squash it into the [1/n] one. + + +From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.com> +Date: Fri, 18 Dec 2015 16:04:35 +0100 +Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI + +The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe +backtrace implementation on all Arm systems. But it did not have a real +NMI handling on CPU_V7M. + +It seems that it causes more confusion than good. Let's use HAVE_NMI +on all arm systems and get rid of the problematic flag. + +Signed-off-by: Petr Mladek <pmladek@suse.com> +--- + arch/Kconfig | 3 --- + arch/arm/Kconfig | 3 +-- + init/Kconfig | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/arch/Kconfig b/arch/Kconfig +index 7ce5101c2472..d1a18b313624 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE + config HAVE_NMI + bool + +-config NEED_PRINTK_NMI +- bool +- + config HAVE_NMI_WATCHDOG + depends on HAVE_NMI + bool +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 96d2c275f0f7..01dc56d8f31b 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -63,8 +63,7 @@ config ARM + select HAVE_KRETPROBES if (HAVE_KPROBES) + select HAVE_MEMBLOCK + select HAVE_MOD_ARCH_SPECIFIC +- select HAVE_NMI if (!CPU_V7M) +- select NEED_PRINTK_NMI if (CPU_V7M) ++ select HAVE_NMI + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select HAVE_OPTPROBES if !THUMB2_KERNEL + select HAVE_PERF_EVENTS +diff --git a/init/Kconfig b/init/Kconfig +index 61cfd96a3c96..abf79f3b1a55 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1481,7 +1481,7 @@ config PRINTK + config PRINTK_NMI + def_bool y + depends on PRINTK +- depends on HAVE_NMI || NEED_PRINTK_NMI ++ depends on HAVE_NMI + + config BUG + bool "BUG() support" if EXPERT +-- +1.8.5.6 diff --git a/a/content_digest b/N1/content_digest index 530f6b6..ce05bb7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,26 +9,8 @@ "ref\020151217143858.447b5fe79aaa5ed7b2328d67@linux-foundation.org\0" "From\0Petr Mladek <pmladek@suse.com>\0" "Subject\0Re: [PATCH v3 4/4] printk/nmi: Increase the size of NMI buffer and make it configurable\0" - "Date\0Fri, 18 Dec 2015 17:18:36 +0100\0" - "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Russell King - ARM Linux <linux@arm.linux.org.uk>" - Geert Uytterhoeven <geert@linux-m68k.org> - Peter Zijlstra <peterz@infradead.org> - Steven Rostedt <rostedt@goodmis.org> - Daniel Thompson <daniel.thompson@linaro.org> - Jiri Kosina <jkosina@suse.com> - Ingo Molnar <mingo@redhat.com> - Thomas Gleixner <tglx@linutronix.de> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - the arch/x86 maintainers <x86@kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - adi-buildroot-devel@lists.sourceforge.net <adi-buildroot-devel@lists.sourceforge.net> - Cris <linux-cris-kernel@axis.com> - Linux MIPS Mailing List <linux-mips@linux-mips.org> - linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - linux-s390 <linux-s390@vger.kernel.org> - Linux-sh list <linux-sh@vger.kernel.org> - " sparclinux <sparclinux@vger.kernel.org>\0" + "Date\0Fri, 18 Dec 2015 16:18:36 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu 2015-12-17 14:38:58, Andrew Morton wrote:\n" @@ -57,6 +39,70 @@ "> So does this mean that the patch will be updated?\n" "\n" "Please, find the follow up patch below. I guess that you will want to\n" - squash it into the [1/n] one. + "squash it into the [1/n] one.\n" + "\n" + "\n" + "From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001\n" + "From: Petr Mladek <pmladek@suse.com>\n" + "Date: Fri, 18 Dec 2015 16:04:35 +0100\n" + "Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI\n" + "\n" + "The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe\n" + "backtrace implementation on all Arm systems. But it did not have a real\n" + "NMI handling on CPU_V7M.\n" + "\n" + "It seems that it causes more confusion than good. Let's use HAVE_NMI\n" + "on all arm systems and get rid of the problematic flag.\n" + "\n" + "Signed-off-by: Petr Mladek <pmladek@suse.com>\n" + "---\n" + " arch/Kconfig | 3 ---\n" + " arch/arm/Kconfig | 3 +--\n" + " init/Kconfig | 2 +-\n" + " 3 files changed, 2 insertions(+), 6 deletions(-)\n" + "\n" + "diff --git a/arch/Kconfig b/arch/Kconfig\n" + "index 7ce5101c2472..d1a18b313624 100644\n" + "--- a/arch/Kconfig\n" + "+++ b/arch/Kconfig\n" + "@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE\n" + " config HAVE_NMI\n" + " \tbool\n" + " \n" + "-config NEED_PRINTK_NMI\n" + "-\tbool\n" + "-\n" + " config HAVE_NMI_WATCHDOG\n" + " \tdepends on HAVE_NMI\n" + " \tbool\n" + "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" + "index 96d2c275f0f7..01dc56d8f31b 100644\n" + "--- a/arch/arm/Kconfig\n" + "+++ b/arch/arm/Kconfig\n" + "@@ -63,8 +63,7 @@ config ARM\n" + " \tselect HAVE_KRETPROBES if (HAVE_KPROBES)\n" + " \tselect HAVE_MEMBLOCK\n" + " \tselect HAVE_MOD_ARCH_SPECIFIC\n" + "-\tselect HAVE_NMI if (!CPU_V7M)\n" + "-\tselect NEED_PRINTK_NMI if (CPU_V7M)\n" + "+\tselect HAVE_NMI\n" + " \tselect HAVE_OPROFILE if (HAVE_PERF_EVENTS)\n" + " \tselect HAVE_OPTPROBES if !THUMB2_KERNEL\n" + " \tselect HAVE_PERF_EVENTS\n" + "diff --git a/init/Kconfig b/init/Kconfig\n" + "index 61cfd96a3c96..abf79f3b1a55 100644\n" + "--- a/init/Kconfig\n" + "+++ b/init/Kconfig\n" + "@@ -1481,7 +1481,7 @@ config PRINTK\n" + " config PRINTK_NMI\n" + " \tdef_bool y\n" + " \tdepends on PRINTK\n" + "-\tdepends on HAVE_NMI || NEED_PRINTK_NMI\n" + "+\tdepends on HAVE_NMI\n" + " \n" + " config BUG\n" + " \tbool \"BUG() support\" if EXPERT\n" + "-- \n" + 1.8.5.6 -744385dd34832aa4ac2fa1cc461d4d70ad8de5038848bb9a2cda5b75f9b13616 +fbf30ccb7635f76615775efd8fc3388fa46937493bed1113a343f84738d72d9c
diff --git a/a/1.txt b/N2/1.txt index adb466b..5c96e5a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,3 +25,67 @@ On Thu 2015-12-17 14:38:58, Andrew Morton wrote: Please, find the follow up patch below. I guess that you will want to squash it into the [1/n] one. + + +>From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.com> +Date: Fri, 18 Dec 2015 16:04:35 +0100 +Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI + +The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe +backtrace implementation on all Arm systems. But it did not have a real +NMI handling on CPU_V7M. + +It seems that it causes more confusion than good. Let's use HAVE_NMI +on all arm systems and get rid of the problematic flag. + +Signed-off-by: Petr Mladek <pmladek@suse.com> +--- + arch/Kconfig | 3 --- + arch/arm/Kconfig | 3 +-- + init/Kconfig | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/arch/Kconfig b/arch/Kconfig +index 7ce5101c2472..d1a18b313624 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE + config HAVE_NMI + bool + +-config NEED_PRINTK_NMI +- bool +- + config HAVE_NMI_WATCHDOG + depends on HAVE_NMI + bool +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 96d2c275f0f7..01dc56d8f31b 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -63,8 +63,7 @@ config ARM + select HAVE_KRETPROBES if (HAVE_KPROBES) + select HAVE_MEMBLOCK + select HAVE_MOD_ARCH_SPECIFIC +- select HAVE_NMI if (!CPU_V7M) +- select NEED_PRINTK_NMI if (CPU_V7M) ++ select HAVE_NMI + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select HAVE_OPTPROBES if !THUMB2_KERNEL + select HAVE_PERF_EVENTS +diff --git a/init/Kconfig b/init/Kconfig +index 61cfd96a3c96..abf79f3b1a55 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1481,7 +1481,7 @@ config PRINTK + config PRINTK_NMI + def_bool y + depends on PRINTK +- depends on HAVE_NMI || NEED_PRINTK_NMI ++ depends on HAVE_NMI + + config BUG + bool "BUG() support" if EXPERT +-- +1.8.5.6 diff --git a/a/content_digest b/N2/content_digest index 530f6b6..d1b5bf9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -57,6 +57,70 @@ "> So does this mean that the patch will be updated?\n" "\n" "Please, find the follow up patch below. I guess that you will want to\n" - squash it into the [1/n] one. + "squash it into the [1/n] one.\n" + "\n" + "\n" + ">From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001\n" + "From: Petr Mladek <pmladek@suse.com>\n" + "Date: Fri, 18 Dec 2015 16:04:35 +0100\n" + "Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI\n" + "\n" + "The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe\n" + "backtrace implementation on all Arm systems. But it did not have a real\n" + "NMI handling on CPU_V7M.\n" + "\n" + "It seems that it causes more confusion than good. Let's use HAVE_NMI\n" + "on all arm systems and get rid of the problematic flag.\n" + "\n" + "Signed-off-by: Petr Mladek <pmladek@suse.com>\n" + "---\n" + " arch/Kconfig | 3 ---\n" + " arch/arm/Kconfig | 3 +--\n" + " init/Kconfig | 2 +-\n" + " 3 files changed, 2 insertions(+), 6 deletions(-)\n" + "\n" + "diff --git a/arch/Kconfig b/arch/Kconfig\n" + "index 7ce5101c2472..d1a18b313624 100644\n" + "--- a/arch/Kconfig\n" + "+++ b/arch/Kconfig\n" + "@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE\n" + " config HAVE_NMI\n" + " \tbool\n" + " \n" + "-config NEED_PRINTK_NMI\n" + "-\tbool\n" + "-\n" + " config HAVE_NMI_WATCHDOG\n" + " \tdepends on HAVE_NMI\n" + " \tbool\n" + "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" + "index 96d2c275f0f7..01dc56d8f31b 100644\n" + "--- a/arch/arm/Kconfig\n" + "+++ b/arch/arm/Kconfig\n" + "@@ -63,8 +63,7 @@ config ARM\n" + " \tselect HAVE_KRETPROBES if (HAVE_KPROBES)\n" + " \tselect HAVE_MEMBLOCK\n" + " \tselect HAVE_MOD_ARCH_SPECIFIC\n" + "-\tselect HAVE_NMI if (!CPU_V7M)\n" + "-\tselect NEED_PRINTK_NMI if (CPU_V7M)\n" + "+\tselect HAVE_NMI\n" + " \tselect HAVE_OPROFILE if (HAVE_PERF_EVENTS)\n" + " \tselect HAVE_OPTPROBES if !THUMB2_KERNEL\n" + " \tselect HAVE_PERF_EVENTS\n" + "diff --git a/init/Kconfig b/init/Kconfig\n" + "index 61cfd96a3c96..abf79f3b1a55 100644\n" + "--- a/init/Kconfig\n" + "+++ b/init/Kconfig\n" + "@@ -1481,7 +1481,7 @@ config PRINTK\n" + " config PRINTK_NMI\n" + " \tdef_bool y\n" + " \tdepends on PRINTK\n" + "-\tdepends on HAVE_NMI || NEED_PRINTK_NMI\n" + "+\tdepends on HAVE_NMI\n" + " \n" + " config BUG\n" + " \tbool \"BUG() support\" if EXPERT\n" + "-- \n" + 1.8.5.6 -744385dd34832aa4ac2fa1cc461d4d70ad8de5038848bb9a2cda5b75f9b13616 +d64ce10444818adea3b5515c56a174938545f522a44c42797378012c803bcd16
diff --git a/a/1.txt b/N3/1.txt index adb466b..5c96e5a 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -25,3 +25,67 @@ On Thu 2015-12-17 14:38:58, Andrew Morton wrote: Please, find the follow up patch below. I guess that you will want to squash it into the [1/n] one. + + +>From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.com> +Date: Fri, 18 Dec 2015 16:04:35 +0100 +Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI + +The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe +backtrace implementation on all Arm systems. But it did not have a real +NMI handling on CPU_V7M. + +It seems that it causes more confusion than good. Let's use HAVE_NMI +on all arm systems and get rid of the problematic flag. + +Signed-off-by: Petr Mladek <pmladek@suse.com> +--- + arch/Kconfig | 3 --- + arch/arm/Kconfig | 3 +-- + init/Kconfig | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/arch/Kconfig b/arch/Kconfig +index 7ce5101c2472..d1a18b313624 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE + config HAVE_NMI + bool + +-config NEED_PRINTK_NMI +- bool +- + config HAVE_NMI_WATCHDOG + depends on HAVE_NMI + bool +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 96d2c275f0f7..01dc56d8f31b 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -63,8 +63,7 @@ config ARM + select HAVE_KRETPROBES if (HAVE_KPROBES) + select HAVE_MEMBLOCK + select HAVE_MOD_ARCH_SPECIFIC +- select HAVE_NMI if (!CPU_V7M) +- select NEED_PRINTK_NMI if (CPU_V7M) ++ select HAVE_NMI + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select HAVE_OPTPROBES if !THUMB2_KERNEL + select HAVE_PERF_EVENTS +diff --git a/init/Kconfig b/init/Kconfig +index 61cfd96a3c96..abf79f3b1a55 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1481,7 +1481,7 @@ config PRINTK + config PRINTK_NMI + def_bool y + depends on PRINTK +- depends on HAVE_NMI || NEED_PRINTK_NMI ++ depends on HAVE_NMI + + config BUG + bool "BUG() support" if EXPERT +-- +1.8.5.6 diff --git a/a/content_digest b/N3/content_digest index 530f6b6..9abaaa7 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -7,28 +7,10 @@ "ref\020151211153054.48da5d4139b93dd4ed438f4c@linux-foundation.org\0" "ref\020151215142621.GE3729@pathway.suse.cz\0" "ref\020151217143858.447b5fe79aaa5ed7b2328d67@linux-foundation.org\0" - "From\0Petr Mladek <pmladek@suse.com>\0" - "Subject\0Re: [PATCH v3 4/4] printk/nmi: Increase the size of NMI buffer and make it configurable\0" + "From\0pmladek@suse.com (Petr Mladek)\0" + "Subject\0[PATCH v3 4/4] printk/nmi: Increase the size of NMI buffer and make it configurable\0" "Date\0Fri, 18 Dec 2015 17:18:36 +0100\0" - "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Russell King - ARM Linux <linux@arm.linux.org.uk>" - Geert Uytterhoeven <geert@linux-m68k.org> - Peter Zijlstra <peterz@infradead.org> - Steven Rostedt <rostedt@goodmis.org> - Daniel Thompson <daniel.thompson@linaro.org> - Jiri Kosina <jkosina@suse.com> - Ingo Molnar <mingo@redhat.com> - Thomas Gleixner <tglx@linutronix.de> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - the arch/x86 maintainers <x86@kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - adi-buildroot-devel@lists.sourceforge.net <adi-buildroot-devel@lists.sourceforge.net> - Cris <linux-cris-kernel@axis.com> - Linux MIPS Mailing List <linux-mips@linux-mips.org> - linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - linux-s390 <linux-s390@vger.kernel.org> - Linux-sh list <linux-sh@vger.kernel.org> - " sparclinux <sparclinux@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu 2015-12-17 14:38:58, Andrew Morton wrote:\n" @@ -57,6 +39,70 @@ "> So does this mean that the patch will be updated?\n" "\n" "Please, find the follow up patch below. I guess that you will want to\n" - squash it into the [1/n] one. + "squash it into the [1/n] one.\n" + "\n" + "\n" + ">From 144d90ada2e34b8807efcc01922c48d7c09797e7 Mon Sep 17 00:00:00 2001\n" + "From: Petr Mladek <pmladek@suse.com>\n" + "Date: Fri, 18 Dec 2015 16:04:35 +0100\n" + "Subject: [PATCH] printk/nmi: Remove the questionable CONFIG_NEED_PRINTK_NMI\n" + "\n" + "The flag NEED_PRINTK_NMI was added because of Arm. It used the NMI safe\n" + "backtrace implementation on all Arm systems. But it did not have a real\n" + "NMI handling on CPU_V7M.\n" + "\n" + "It seems that it causes more confusion than good. Let's use HAVE_NMI\n" + "on all arm systems and get rid of the problematic flag.\n" + "\n" + "Signed-off-by: Petr Mladek <pmladek@suse.com>\n" + "---\n" + " arch/Kconfig | 3 ---\n" + " arch/arm/Kconfig | 3 +--\n" + " init/Kconfig | 2 +-\n" + " 3 files changed, 2 insertions(+), 6 deletions(-)\n" + "\n" + "diff --git a/arch/Kconfig b/arch/Kconfig\n" + "index 7ce5101c2472..d1a18b313624 100644\n" + "--- a/arch/Kconfig\n" + "+++ b/arch/Kconfig\n" + "@@ -190,9 +190,6 @@ config HAVE_KPROBES_ON_FTRACE\n" + " config HAVE_NMI\n" + " \tbool\n" + " \n" + "-config NEED_PRINTK_NMI\n" + "-\tbool\n" + "-\n" + " config HAVE_NMI_WATCHDOG\n" + " \tdepends on HAVE_NMI\n" + " \tbool\n" + "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" + "index 96d2c275f0f7..01dc56d8f31b 100644\n" + "--- a/arch/arm/Kconfig\n" + "+++ b/arch/arm/Kconfig\n" + "@@ -63,8 +63,7 @@ config ARM\n" + " \tselect HAVE_KRETPROBES if (HAVE_KPROBES)\n" + " \tselect HAVE_MEMBLOCK\n" + " \tselect HAVE_MOD_ARCH_SPECIFIC\n" + "-\tselect HAVE_NMI if (!CPU_V7M)\n" + "-\tselect NEED_PRINTK_NMI if (CPU_V7M)\n" + "+\tselect HAVE_NMI\n" + " \tselect HAVE_OPROFILE if (HAVE_PERF_EVENTS)\n" + " \tselect HAVE_OPTPROBES if !THUMB2_KERNEL\n" + " \tselect HAVE_PERF_EVENTS\n" + "diff --git a/init/Kconfig b/init/Kconfig\n" + "index 61cfd96a3c96..abf79f3b1a55 100644\n" + "--- a/init/Kconfig\n" + "+++ b/init/Kconfig\n" + "@@ -1481,7 +1481,7 @@ config PRINTK\n" + " config PRINTK_NMI\n" + " \tdef_bool y\n" + " \tdepends on PRINTK\n" + "-\tdepends on HAVE_NMI || NEED_PRINTK_NMI\n" + "+\tdepends on HAVE_NMI\n" + " \n" + " config BUG\n" + " \tbool \"BUG() support\" if EXPERT\n" + "-- \n" + 1.8.5.6 -744385dd34832aa4ac2fa1cc461d4d70ad8de5038848bb9a2cda5b75f9b13616 +d3b5fe86237cf3f26bd105d4590085e027e4b516ac290773ff33fc502acc47c4
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.