summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-04-17 20:08:08 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-17 20:08:08 +0300
commitbf9196d51f7d7222875916c685653981088668b1 (patch)
treec42258a88a91cc5e35a0f1b6054507e136b0d2cf /drivers
parent2acbb9e670347879e4815b2010f46ee01f1caf30 (diff)
parent3f22037d382b45710248b6faa4d5bd30d169c4ba (diff)
downloadlinux-bf9196d51f7d7222875916c685653981088668b1.tar.xz
Merge tag 'block-5.7-2020-04-17' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: - Fix for a driver tag leak in error handling (John) - Remove now defunct Kconfig selection from dasd (Stefan) - blk-wbt trace fiexs (Tommi) * tag 'block-5.7-2020-04-17' of git://git.kernel.dk/linux-block: blk-wbt: Drop needless newlines from tracepoint format strings blk-wbt: Use tracepoint_string() for wbt_step tracepoint string literals s390/dasd: remove IOSCHED_DEADLINE from DASD Kconfig blk-mq: Put driver tag in blk_mq_dispatch_rq_list() when no budget
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/block/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index a8682f69effc..376f1efbbb86 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -26,7 +26,6 @@ config DASD
def_tristate y
prompt "Support for DASD devices"
depends on CCW && BLOCK
- select IOSCHED_DEADLINE
help
Enable this option if you want to access DASDs directly utilizing
S/390s channel subsystem commands. This is necessary for running