]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'block-5.7-2020-04-17' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2020 17:08:08 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2020 17:08:08 +0000 (10:08 -0700)
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


Trivial merge