Messages in this thread | | | Date | Thu, 14 Mar 2013 15:52:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the bcon tree with Linus' tree |
| |
Hi Jörn,
Today's linux-next merge of the bcon tree got a conflict in drivers/block/Kconfig between commit 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver") from Linus' tree and commit a2ff9d05bbb4 ("add blockconsole version 1.1") from the bcon tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/block/Kconfig index 5dc0dae,06eb42f..0000000 --- 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 "RamSam PCIe Flash SSD Device Driver" + depends on PCI + help + Device driver for IBM's high speed PCIe SSD + storage devices: RamSan-70 and RamSan-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 [unhandled content-type:application/pgp-signature] | |