Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Feb 2017 21:01:58 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Feb 2017 21:01:58 +0000 (13:01 -0800)
commit6dc39c50e4aeb769c8ae06edf2b1a732f3490913
tree2df396e0b3cb3827a1f8a321bb49b202ea7515d6
parent2fe1e8a7b2f4dcac3fcb07ff06b0ae7396201fd6
parent5d7f5ce15156af205e175e8fa5c669ba40bf0c5e
Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block layer fix from Jens Axboe:
 "A single fix for a lockdep splat reported by Thomas and Gabriel"

* 'for-linus' of git://git.kernel.dk/linux-block:
  cfq-iosched: don't call wbt_disable_default() with IRQs disabled