Merge branch 'for-linus' into for-4.12/block
authorJens Axboe <axboe@fb.com>
Fri, 7 Apr 2017 18:45:20 +0000 (12:45 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 7 Apr 2017 18:45:20 +0000 (12:45 -0600)
commit65f619d2535197d97067eeeef75a40f25b552e69
tree13f96c51a2b591ed22f1771541998bb77178f685
parentfbbaf700e7b163a0f1704b2d542ee28be11fce21
parent6d8c6c0f97ad8a3517c42b179c1dc8e77397d0e2
Merge branch 'for-linus' into for-4.12/block

We've added a considerable amount of fixes for stalls and issues
with the blk-mq scheduling in the 4.11 series since forking
off the for-4.12/block branch. We need to do improvements on
top of that for 4.12, so pull in the previous fixes to make
our lives easier going forward.

Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-mq.c
block/blk-mq.h
block/blk-sysfs.c
drivers/block/nbd.c
drivers/md/dm-rq.c
drivers/nvme/host/core.c
drivers/nvme/target/admin-cmd.c
drivers/nvme/target/io-cmd.c
drivers/scsi/scsi_lib.c
include/linux/blk-mq.h
include/linux/blkdev.h