linux-next: manual merge of the block tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
lib/Kconfig.debug between commits
0f6add4bafdbff7a822e37dec0436e2392864d9a ("Move lkdtm to tests/") and 94a97a3018e55a27d1c29e011b3c38fee01a967f ("Move backtrace selftests to
tests/") from the test tree and commit
3e5ba59bbab878f60b8b87004ac55a464bddc819 ("block: implement
CONFIG_DEBUG_BLOCK_EXT_DEVT") from the block tree.

Just overlapping add/removes.  I fixed it up (see below) and can carry
the fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc lib/Kconfig.debug
index f62c706,1bc3c07..0000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -572,6 -624,38 +572,22 @@@ config RCU_CPU_STAL
  
  	  Say N if you are unsure.
  
+ config DEBUG_BLOCK_EXT_DEVT
+         bool "Force extended block device numbers and spread them"
+ 	depends on DEBUG_KERNEL
+ 	depends on BLOCK
+ 	default y
+ 	help
+ 	  Conventionally, block device numbers are allocated from
+ 	  predetermined contiguous area.  However, extended block area
+ 	  may introduce non-contiguous block device numbers.  This
+ 	  option forces most block device numbers to be allocated from
+ 	  the extended space and spreads them to discover kernel or
+ 	  userland code paths which assume predetermined contiguous
+ 	  device number allocation.
+ 
+ 	  Say N if you are unsure.
+ 
 -config LKDTM
 -	tristate "Linux Kernel Dump Test Tool Module"
 -	depends on DEBUG_KERNEL
 -	depends on KPROBES
 -	depends on BLOCK
 -	default n
 -	help
 -	This module enables testing of the different dumping mechanisms by
 -	inducing system failures at predefined crash points.
 -	If you don't need it: say N
 -	Choose M here to compile this code as a module. The module will be
 -	called lkdtm.
 -
 -	Documentation on how to use the module can be found in
 -	drivers/misc/lkdtm.c
 -
  config FAULT_INJECTION
  	bool "Fault-injection framework"
  	depends on DEBUG_KERNEL