From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2021 23:36:42 +0000 (-1000)
Subject: Merge tag 'block-5.14-2021-08-13' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.14-rc6~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=020efdadd84958debc36e74fb5cc52b30697a611;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'block-5.14-2021-08-13' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A few fixes for block that should go into 5.14:

   - Revert the mq-deadline cgroup addition. More work is needed on this
     front, let's revert it for now and get it right before having it in
     a released kernel (Tejun)

   - blk-iocost lockdep fix (Ming)

   - nbd double completion fix (Xie)

   - Fix for non-idling when clearing the shared tag flag (Yu)"

* tag 'block-5.14-2021-08-13' of git://git.kernel.dk/linux-block:
  nbd: Aovid double completion of a request
  blk-mq: clear active_queues before clearing BLK_MQ_F_TAG_QUEUE_SHARED
  Revert "block/mq-deadline: Add cgroup support"
  blk-iocost: fix lockdep warning on blkcg->lock
---

020efdadd84958debc36e74fb5cc52b30697a611