tree 31a0786d132aadf4cbb9725f3f444ef6e1052128
parent bb2e226b3bef596dd56be97df655d857b4603923
parent 0a30288da1aec914e158c2d7a3482a85f632750f
author Tejun Heo <tj@kernel.org> 1411578021 -0400
committer Tejun Heo <tj@kernel.org> 1411578021 -0400

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block into for-3.18

This is to receive 0a30288da1ae ("blk-mq, percpu_ref: implement a
kludge for SCSI blk-mq stall during probe") which implements
__percpu_ref_kill_expedited() to work around SCSI blk-mq stall.  The
commit reverted and patches to implement proper fix will be added.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>