]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fe1e8a 5d7f5ce)
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)
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


Trivial merge
local clone of linux.git