projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bf772b bea99a5)
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)
* 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

1  2 
drivers/md/dm-rq.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_lib.c patch | diff1 | diff2 | blob | history

diff --cc drivers/md/dm-rq.c
Simple merge
diff --cc drivers/scsi/scsi_lib.c
Simple merge
Linux 6.x block layer and io_uring tree(s)