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
This commit is contained in:
Jens Axboe 2018-02-01 20:27:02 -07:00
commit 3c15f3f545
11 changed files with 75 additions and 26 deletions