Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux...
authorTejun Heo <tj@kernel.org>
Wed, 24 Sep 2014 17:00:21 +0000 (13:00 -0400)
committerTejun Heo <tj@kernel.org>
Wed, 24 Sep 2014 17:00:21 +0000 (13:00 -0400)
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>
1  2 
block/blk-mq.c
fs/aio.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/ext3/super.c
fs/ext4/super.c
include/linux/percpu-refcount.h
kernel/cgroup.c
lib/percpu-refcount.c
mm/mmap.c

diff --cc block/blk-mq.c
Simple merge
diff --cc fs/aio.c
Simple merge
Simple merge
Simple merge
diff --cc fs/ext3/super.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge