Fix up merge conflicts in the CHANGELOG
There were a number of unflagged merge conflicts in the CHANGELOG that resulted in duplicated sections and notes being out of place. Clean them up. Change-Id: I88a590fad9d8812554665102e764bdaeccaea827 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/374714 Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
parent
bf6caa753d
commit
ea957ff3a6
10
CHANGELOG.md
10
CHANGELOG.md
@ -2,17 +2,12 @@
|
||||
|
||||
## v17.10: (Upcoming Release)
|
||||
|
||||
### NVMe driver
|
||||
|
||||
Disable HotplugEnable option by default, users can enable it with
|
||||
`HotplugEnable Yes` in `[Nvme]` section of the configuration file.
|
||||
### Block Device Abstraction Layer (bdev)
|
||||
|
||||
An [fio](http://github.com/axboe/fio) plugin was added that can route
|
||||
I/O to the bdev layer. See the [plugin documentation](https://github.com/spdk/spdk/blob/master/examples/bdev/fio_plugin/README.md)
|
||||
for more information.
|
||||
|
||||
### Block Device Abstraction Layer (bdev)
|
||||
|
||||
spdk_bdev_unmap() was modified to take an offset and a length in bytes as
|
||||
arguments instead of requiring the user to provide an array of SCSI
|
||||
unmap descriptors. This limits unmaps to a single contiguous range.
|
||||
@ -31,6 +26,9 @@ The NVMe driver now recognizes the NVMe 1.3 Namespace Optimal I/O Boundary field
|
||||
NVMe 1.3 devices may report an optimal I/O boundary, which the driver will take
|
||||
into account when splitting I/O requests.
|
||||
|
||||
The HotplugEnable option in `[Nvme]` sections of the configuration file is now
|
||||
"No" by default. It was previously "Yes".
|
||||
|
||||
### NVMe-oF Target (nvmf)
|
||||
|
||||
The NVMe-oF target no longer requires any in capsule data buffers to run, and
|
||||
|
Loading…
Reference in New Issue
Block a user