Merge tag 'block-5.14-2021-08-13' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2021 23:36:42 +0000 (13:36 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2021 23:36:42 +0000 (13:36 -1000)
commit020efdadd84958debc36e74fb5cc52b30697a611
tree9935e53d45d0c7de991b0053e85f31d976f6129d
parent42995cee61f842c4e275e4902459f8a951fe4607
parentcddce01160582a5f52ada3da9626c052d852ec42
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