Merge tag 'v3.15-rc1' into for-3.16/core
authorJens Axboe <axboe@fb.com>
Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
commitf89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0
tree6d4ca8c67dc22d1c81053392078588f9ab3804b5
parent21f9fcd81593e201172160853b8647336fb81f4f
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5
Merge tag 'v3.15-rc1' into for-3.16/core

We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
block/blk-core.c
drivers/scsi/scsi_lib.c
include/linux/blkdev.h