diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-02-02 04:27:02 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-02 04:27:02 +0100 |
| commit | 3c15f3f545afa320c5e3822825a9a53c664776b6 (patch) | |
| tree | c6e0a7d7299e8012c2bf77e396aae40455d77d13 /firmware | |
| parent | Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | blk-mq-sched: Enable merging discard bio into request (diff) | |
| download | linux-3c15f3f545afa320c5e3822825a9a53c664776b6.tar.xz linux-3c15f3f545afa320c5e3822825a9a53c664776b6.zip | |
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
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions