From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Mar 2022 20:56:36 +0000 (-0800)
Subject: Merge tag 'block-5.17-2022-03-10' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.1-rc5~1868
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bcb6451cc96ca38e50120a4f333ecf157245544;p=platform%2Fkernel%2Flinux-starfive.git

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
---

3bcb6451cc96ca38e50120a4f333ecf157245544