diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 19:45:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 19:45:59 -0400 |
| commit | 3e8072d48b2dd0898e99698018b2045f8cd49965 (patch) | |
| tree | 5710e46918d4e358f22fb6038ad81d1abdd3f1f8 /include/uapi | |
| parent | a63b747b41d6f6c9116fb2260381a3c96fe5dc02 (diff) | |
| parent | edd10d33283899fb15d99a290dcc9ceb3604ca78 (diff) | |
Merge git://git.infradead.org/users/willy/linux-nvme
Pull NVMe driver updates from Matthew Wilcox:
"Various updates to the NVMe driver. The most user-visible change is
that drive hotplugging now works and CPU hotplug while an NVMe drive
is installed should also work better"
* git://git.infradead.org/users/willy/linux-nvme:
NVMe: Retry failed commands with non-fatal errors
NVMe: Add getgeo to block ops
NVMe: Start-stop nvme_thread during device add-remove.
NVMe: Make I/O timeout a module parameter
NVMe: CPU hot plug notification
NVMe: per-cpu io queues
NVMe: Replace DEFINE_PCI_DEVICE_TABLE
NVMe: Fix divide-by-zero in nvme_trans_io_get_num_cmds
NVMe: IOCTL path RCU protect queue access
NVMe: RCU protected access to io queues
NVMe: Initialize device reference count earlier
NVMe: Add CONFIG_PM_SLEEP to suspend/resume functions
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nvme.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h index e5ab62201119..096fe1c6f83d 100644 --- a/include/uapi/linux/nvme.h +++ b/include/uapi/linux/nvme.h | |||
| @@ -434,6 +434,7 @@ enum { | |||
| 434 | NVME_SC_REFTAG_CHECK = 0x284, | 434 | NVME_SC_REFTAG_CHECK = 0x284, |
| 435 | NVME_SC_COMPARE_FAILED = 0x285, | 435 | NVME_SC_COMPARE_FAILED = 0x285, |
| 436 | NVME_SC_ACCESS_DENIED = 0x286, | 436 | NVME_SC_ACCESS_DENIED = 0x286, |
| 437 | NVME_SC_DNR = 0x4000, | ||
| 437 | }; | 438 | }; |
| 438 | 439 | ||
| 439 | struct nvme_completion { | 440 | struct nvme_completion { |