diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 18:28:04 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 18:28:04 +0300 |
| commit | 13e98fd1efc7f65cab1bba6cfab7859840f9aa66 (patch) | |
| tree | 88be4e84a1c257e7e999d7bd344c511c66e7973e /include/uapi/linux | |
| parent | e28e909c36bb5d6319953822d84df00fce7cbd18 (diff) | |
| parent | 05fb05a6ca25e02ad8c31bc440b3c4996864f379 (diff) | |
| download | linux-13e98fd1efc7f65cab1bba6cfab7859840f9aa66.tar.xz | |
Merge tag 'kvm-arm-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.7-rc2
Fixes for the vgic, 2 of the patches address a bug introduced in v4.6
while the rest are for the new vgic.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/nvme_ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h index c4b2a3f90829..50ff21f748b6 100644 --- a/include/uapi/linux/nvme_ioctl.h +++ b/include/uapi/linux/nvme_ioctl.h @@ -61,5 +61,6 @@ struct nvme_passthru_cmd { #define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct nvme_passthru_cmd) #define NVME_IOCTL_RESET _IO('N', 0x44) #define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) +#define NVME_IOCTL_RESCAN _IO('N', 0x46) #endif /* _UAPI_LINUX_NVME_IOCTL_H */ |