diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-31 21:42:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-31 21:42:21 -0400 |
| commit | 501d9f79451aff460c3b50c73706494d7ba82d72 (patch) | |
| tree | 737f4db174eb727ae7342165cf2baf2f78827ab8 /include/linux | |
| parent | 73adb8c5b0ea15e3942ab5781eb3e72d4e028ada (diff) | |
| parent | 7ef10f3cddb56c65881301d6b4d39c475369be5d (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Unfortunately a few issues that warrant sending another pull request,
even if I had hoped to avoid it. This contains:
- A fix for multiqueue xen-blkback, on tear down / disconnect.
- A few fixups for NVMe, including a wrong bit definition, fix for
host memory buffers, and an nvme rdma page size fix"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvme: fix the definition of the doorbell buffer config support bit
nvme-pci: use dma memory for the host memory buffer descriptors
nvme-rdma: default MR page size to 4k
xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 25d8225dbd04..8efff888bd9b 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h | |||
| @@ -254,7 +254,7 @@ enum { | |||
| 254 | NVME_CTRL_VWC_PRESENT = 1 << 0, | 254 | NVME_CTRL_VWC_PRESENT = 1 << 0, |
| 255 | NVME_CTRL_OACS_SEC_SUPP = 1 << 0, | 255 | NVME_CTRL_OACS_SEC_SUPP = 1 << 0, |
| 256 | NVME_CTRL_OACS_DIRECTIVES = 1 << 5, | 256 | NVME_CTRL_OACS_DIRECTIVES = 1 << 5, |
| 257 | NVME_CTRL_OACS_DBBUF_SUPP = 1 << 7, | 257 | NVME_CTRL_OACS_DBBUF_SUPP = 1 << 8, |
| 258 | }; | 258 | }; |
| 259 | 259 | ||
| 260 | struct nvme_lbaf { | 260 | struct nvme_lbaf { |