]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit442f1e262fe0972cb03c9d7c71d3a52f6866e7e2
tree64b7506e879c4d9c7364d3b336f11b11fedbc724
parentb49667909eff0371fbbac5ac09c0632265330ff0
parent1b1d3934922c105f41e5199d920641e260e040d5
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