Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Aug 2017 17:37:35 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Aug 2017 17:37:35 +0000 (10:37 -0700)
commit31cf92f3dda8ecf4ce19761847cad6e1ffa144e1
tree64b7506e879c4d9c7364d3b336f11b11fedbc724
parentd555eb6b363455997f1e3ab8604e323c28972ad5
parent1ad43c0078b79a76accd0fe64062e47b3430dc6b
Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Three patches that should go into this release.

  Two of them are from Paolo and fix up some corner cases with BFQ, and
  the last patch is from Ming and fixes up a potential usage count
  imbalance regression due to the recent NOWAIT work"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: don't leak preempt counter/q_usage_counter when allocating rq failed
  block, bfq: consider also in_service_entity to state whether an entity is active
  block, bfq: reset in_service_entity if it becomes idle