From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jul 2015 15:16:41 +0000 (-0700)
Subject: Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1468
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91cca0f0ffa3e485ad9d5b44744f23318c8f99ab;hp=ec0337e089b21d1d81e23d31807a9b02df11daac;p=firefly-linux-kernel-4.4.55.git

Merge branch 'core-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull max log buf size increase from Ingo Molnar:
 "Ran into this limit recently, so increase it by an order of magnitude"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  printk: Increase maximum CONFIG_LOG_BUF_SHIFT from 21 to 25
---

diff --git a/init/Kconfig b/init/Kconfig
index bcc41bd19999..53c41a84dd03 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -820,7 +820,7 @@ config IKCONFIG_PROC
 
 config LOG_BUF_SHIFT
 	int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
-	range 12 21
+	range 12 25
 	default 17
 	depends on PRINTK
 	help