[GIT PULL] Block fix for 5.17-final

[Jens Axboe <axboe@xxxxxxxxx>]

Hi Linus,

Just a single fix for a regression that occured in this merge window.

Please pull!


The following changes since commit 30939293262eb433c960c4532a0d59c4073b2b84:

  blktrace: fix use after free for struct blk_trace (2022-02-28 06:36:33 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux-block.git tags/block-5.17-2022-03-10

for you to fetch changes up to 0a5aa8d161d19a1b12fd25b434b32f7c885c73bb:

  block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection (2022-03-08 17:48:39 -0700)

----------------------------------------------------------------
block-5.17-2022-03-10

----------------------------------------------------------------
Shin'ichiro Kawasaki (1):
      block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection

 block/blk-mq.c | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

-- 
Jens Axboe