All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
* [folded-merged] printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix.patch removed from -mm tree
@ 2016-01-20 21:11 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2016-01-20 21:11 UTC (permalink / raw
  To: pmladek, arnd, geert+renesas, mm-commits


The patch titled
     Subject: printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix
has been removed from the -mm tree.  Its filename was
     printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix.patch

This patch was dropped because it was folded into printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch

------------------------------------------------------
From: Petr Mladek <pmladek@suse.com>
Subject: printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 init/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN init/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix init/Kconfig
--- a/init/Kconfig~printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix
+++ a/init/Kconfig
@@ -870,7 +870,7 @@ config NMI_LOG_BUF_SHIFT
 	int "Temporary per-CPU NMI log buffer size (12 => 4KB, 13 => 8KB)"
 	range 10 21
 	default 13
-	depends on PRINTK && HAVE_NMI
+	depends on PRINTK_NMI
 	help
 	  Select the size of a per-CPU buffer where NMI messages are temporary
 	  stored. They are copied to the main log buffer in a safe context
_

Patches currently in -mm which might be from pmladek@suse.com are

printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
printk-nmi-use-irq-work-only-when-ready.patch
printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-01-20 21:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-20 21:11 [folded-merged] printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix.patch removed from -mm tree akpm

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.