diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-12 22:40:15 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-12 22:40:15 +0400 |
commit | 192c028b6ac972df25fd624f94a94d038fbdb66c (patch) | |
tree | 4dd9d13ffd239e4d7c61401f892989742c671fa8 /drivers/md/Kconfig | |
parent | ea1990c3796e7550e6f240983f2d1b8e5ecf3891 (diff) | |
parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
download | linux-192c028b6ac972df25fd624f94a94d038fbdb66c.tar.xz |
Merge 3.14-rc6 into usb-next
We want the USB fixes in here as well.
Diffstat (limited to 'drivers/md/Kconfig')
-rw-r--r-- | drivers/md/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 9a06fe883766..95ad936e6048 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -254,16 +254,6 @@ config DM_THIN_PROVISIONING ---help--- Provides thin provisioning and snapshots that share a data store. -config DM_DEBUG_BLOCK_STACK_TRACING - boolean "Keep stack trace of persistent data block lock holders" - depends on STACKTRACE_SUPPORT && DM_PERSISTENT_DATA - select STACKTRACE - ---help--- - Enable this for messages that may help debug problems with the - block manager locking used by thin provisioning and caching. - - If unsure, say N. - config DM_CACHE tristate "Cache target (EXPERIMENTAL)" depends on BLK_DEV_DM |