Merge branch 'block-5.7' into for-current
authorJens Axboe <axboe@kernel.dk>
Fri, 17 Apr 2020 14:22:37 +0000 (08:22 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 17 Apr 2020 14:22:37 +0000 (08:22 -0600)
commitfa2f82285f65438ee768ca875a30d38b87d17aaa
tree5d0577725c35fd52293e47b1ef7112cad31d73e3
parent6cd75cc1b8feaac78af45ee6395a91578ee2a196
parent3f22037d382b45710248b6faa4d5bd30d169c4ba
Merge branch 'block-5.7' into for-current

* block-5.7:
  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