]> 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)
commit75c131152ed8f8f3dd14ef869d1c7fbc5654bde4
tree64b7506e879c4d9c7364d3b336f11b11fedbc724
parent3207ccff88f3aeb49981b6a6d16d91d69730f808
parenta7ced61f68d2e86bb31757ab88fa5cc5f1f64333
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