From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 05:44:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'bcon/master'
X-Git-Tag: next-20130619~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35b129aa7192fb5e92929aede9504b29a0f2ff4a;p=karo-tx-linux.git

Merge remote-tracking branch 'bcon/master'

Conflicts:
	drivers/block/Kconfig
---

35b129aa7192fb5e92929aede9504b29a0f2ff4a
diff --cc drivers/block/Kconfig
index b81ddfea1da0,06eb42f619bd..53e13ef50817
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@@ -531,14 -544,10 +531,20 @@@ config BLK_DEV_RB
  
  	  If unsure, say N.
  
 +config BLK_DEV_RSXX
 +	tristate "IBM FlashSystem 70/80 PCIe SSD Device Driver"
 +	depends on PCI
 +	help
 +	  Device driver for IBM's high speed PCIe SSD
 +	  storage devices: FlashSystem-70 and FlashSystem-80.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called rsxx.
 +
+ config BLOCKCONSOLE
+ 	bool "Block device console logging support"
+ 	help
+ 	  This enables logging to block devices.
+ 	  See <file:Documentation/block/blockconsole.txt> for details.
+ 
  endif # BLK_DEV
diff --cc drivers/block/Makefile
index ca07399a8d99,99c5c2ed8a05..2a63ed3def8f
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -39,8 -40,6 +39,9 @@@ obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen
  obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
  obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
  obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)	+= mtip32xx/
+ obj-$(CONFIG_BLOCKCONSOLE)	+= blockconsole.o
  
 +obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 +
 +nvme-y		:= nvme-core.o nvme-scsi.o
  swim_mod-y	:= swim.o swim_asm.o
diff --cc kernel/printk.c
index 8212c1aef125,5221c591ccbe..0a4095e2fcda
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@@ -1270,10 -1259,8 +1270,8 @@@ static void call_console_drivers(int le
  {
  	struct console *con;
  
 -	trace_console(text, 0, len, len);
 +	trace_console(text, len);
  
- 	if (level >= console_loglevel && !ignore_loglevel)
- 		return;
  	if (!console_drivers)
  		return;