Merge remote-tracking branch 'bcon/master'

Conflicts:
	drivers/block/Kconfig

diff --cc Documentation/networking/netconsole.txt
Simple merge

diff --cc block/partitions/Makefile
Simple merge

diff --cc block/partitions/check.c
Simple merge

diff --cc block/partitions/check.h
Simple merge

diff --cc drivers/block/Kconfig
index e07a5fd58ad7463f8775f7334fd692c7e51df2ad,06eb42f619bdec4945b874f95ac9ae588596208e..bb237c4789bfd857771650b757fd95e1e09ba646
--- 1/drivers/block/Kconfig
--- 2/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 Flash Adapter 900GB Full Height PCIe Device Driver"
 +      depends on PCI
 +      help
 +        Device driver for IBM's high speed PCIe SSD
 +        storage device: Flash Adapter 900GB Full Height.
 +
 +        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 ca07399a8d99efb2d11b80bc266c52c496c902e3,99c5c2ed8a05df6041a5d0b3b4bc04ffee8ead60..2a63ed3def8fe4d3e8c9dc0c57587cca27cfc524
--- 1/drivers/block/Makefile
--- 2/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 drivers/net/netconsole.c
Simple merge

diff --cc include/linux/console.h
Simple merge

diff --cc include/linux/mount.h
Simple merge

diff --cc init/do_mounts.c
Simple merge

diff --cc kernel/printk/printk.c
index 5b5a7080e2a5f2822dfd93190c05302be74b1784,5221c591ccbe0efecce759bb954a083500009211..49739db37b92435f159d0add6e3ec427e9c51611
--- 1/kernel/printk/printk.c
--- 2/kernel/printk.c
+++ b/kernel/printk/printk.c
@@@ -1265,10 -1259,8 +1265,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;