Merge tag 'block-5.17-2022-03-10' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2022 20:56:36 +0000 (12:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2022 20:56:36 +0000 (12:56 -0800)
commit3bcb6451cc96ca38e50120a4f333ecf157245544
tree82aca15eb97b799dfd24f6a0b5990a7790a0442d
parentc30b5b8cfb72cc83c10793588ce94471a4769409
parent0a5aa8d161d19a1b12fd25b434b32f7c885c73bb
Merge tag 'block-5.17-2022-03-10' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "Just a single fix for a regression that occured in this merge window"

* tag 'block-5.17-2022-03-10' of git://git.kernel.dk/linux-block:
  block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection