From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 2 Feb 2018 03:27:02 +0000 (-0700)
Subject: Merge branch 'for-linus' into test
X-Git-Tag: for-linus-20180210~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3c15f3f545afa320c5e3822825a9a53c664776b6;p=linux-2.6-block.git

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
---

3c15f3f545afa320c5e3822825a9a53c664776b6