diff options
author | Jens Axboe <axboe@kernel.dk> | 2017-09-01 21:52:37 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-09-01 21:52:37 +0200 |
commit | a254d989f31df97be9ee07a13b9b20087d0d3106 (patch) | |
tree | 3c7b93f881bd4f93997f67826b79e1e5d23c6b93 /block/bfq-iosched.c | |
parent | block/loop: allow request merge for directio mode (diff) | |
parent | nvme-fabrics: generate spec-compliant UUID NQNs (diff) | |
download | linux-a254d989f31df97be9ee07a13b9b20087d0d3106.tar.xz linux-a254d989f31df97be9ee07a13b9b20087d0d3106.zip |
Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-4.14/block-postmerge
Pull NVMe updates from Christoph:
"A few more nvme updates for 4.14:
- generate a correct default NQN (Daniel Verkamp)
- metadata passthrough for the NVME_IOCTL_IO_CMD ioctl, as well as
related fixes and cleanups (Keith)
- better scalability for connecting to the NVMeOF target (Roland Dreier)
- target support for reading the host identifier (Omri Mann)"
Diffstat (limited to 'block/bfq-iosched.c')
0 files changed, 0 insertions, 0 deletions