From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Aug 2017 17:37:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: MMI-PSA29.97-13-9~5001
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=31cf92f3dda8ecf4ce19761847cad6e1ffa144e1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

31cf92f3dda8ecf4ce19761847cad6e1ffa144e1