From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Sep 2021 17:06:26 +0000 (-0700)
Subject: Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block
X-Git-Tag: microblaze-v5.16~81
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=1dbe7e386f505bdae30f7436c41769149c7dcf32

Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Was going to send this one in later this week, but given that -Werror
  is now enabled (or at least available), the mq-deadline fix really
  should go in for the folks hitting that.

   - Ensure dd_queued() is only there if needed (Geert)

   - Fix a kerneldoc warning for bio_alloc_kiocb()

   - BFQ fix for queue merging

   - loop locking fix (Tetsuo)"

* tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block:
  loop: reduce the loop_ctl_mutex scope
  bio: fix kerneldoc documentation for bio_alloc_kiocb()
  block, bfq: honor already-setup queue merges
  block/mq-deadline: Move dd_queued() to fix defined but not used warning
---

1dbe7e386f505bdae30f7436c41769149c7dcf32