Merge branch 'for-linus' into test
authorJens Axboe <axboe@kernel.dk>
Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
commit3c15f3f545afa320c5e3822825a9a53c664776b6
treec6e0a7d7299e8012c2bf77e396aae40455d77d13
parent4bf772b14675411a69b3c807f73006de0fe4b649
parentbea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b
Merge branch 'for-linus' into test

* for-linus:
  blk-mq-sched: Enable merging discard bio into request
  blk-mq: fix discard merge with scheduler attached
  blk-mq: introduce BLK_STS_DEV_RESOURCE
drivers/md/dm-rq.c
drivers/scsi/scsi_lib.c