diff options
author | 2020-04-17 10:08:08 -0700 | |
---|---|---|
committer | 2020-04-17 10:08:08 -0700 | |
commit | bf9196d51f7d7222875916c685653981088668b1 (patch) | |
tree | c42258a88a91cc5e35a0f1b6054507e136b0d2cf /fs | |
parent | Merge tag 'libata-5.7-2020-04-17' of git://git.kernel.dk/linux-block (diff) | |
parent | blk-wbt: Drop needless newlines from tracepoint format strings (diff) | |
download | linux-dev-bf9196d51f7d7222875916c685653981088668b1.tar.xz linux-dev-bf9196d51f7d7222875916c685653981088668b1.zip |
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 'fs')
0 files changed, 0 insertions, 0 deletions