Merge remote-tracking branch 'bcon/master'

Conflicts:
	drivers/block/Kconfig

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

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

diff --cc drivers/block/Kconfig
index b81ddfea1da075ad3c1d0cbeb9ab7bf854593436,06eb42f619bdec4945b874f95ac9ae588596208e..53e13ef5081707eca1ac88ddf30d55a52cfa12b1
--- 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 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 a3b40232c6aba612c27ebbb9c19d815193c6464e,99c5c2ed8a05df6041a5d0b3b4bc04ffee8ead60..77d950abc28254de8ef2410e14537b3c051e56ab
--- 1/drivers/block/Makefile
--- 2/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -39,7 -40,6 +39,8 @@@ 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/
 +
  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 init/do_mounts.c
Simple merge

diff --cc kernel/printk.c
Simple merge