diff options
| author |   Jens Axboe <axboe@fb.com> | 2016-08-29 08:39:22 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-08-29 08:39:22 -0600 |
| commit | d8d8d9d789097f91edaeee65b77523079fa8cf3f (patch) | |
| tree | a5bd59f8c90a158dd7721a60abaece4866a2f47b /include | |
| parent | Linux 4.8-rc4 (diff) | |
| parent | nvme-rdma: Get rid of redundant defines (diff) | |
| download | linux-dev-d8d8d9d789097f91edaeee65b77523079fa8cf3f.tar.xz linux-dev-d8d8d9d789097f91edaeee65b77523079fa8cf3f.zip | |
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
Sagi writes:
Mostly stability fixes and cleanups:
- NQN endianess fix from Daniel
- possible use-after-free fix from Vincent
- nvme-rdma connect semantics fixes from Jay
- Remove redundant variables in rdma driver
- Kbuild fix from Christoph
- nvmf_host referencing fix from Christoph
- uninit variable fix from Colin
Diffstat (limited to 'include')
| -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 d8b37bab2887..7676557ce357 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -794,7 +794,7 @@ struct nvmf_connect_command { }; struct nvmf_connect_data { - uuid_le hostid; + uuid_be hostid; __le16 cntlid; char resv4[238]; char subsysnqn[NVMF_NQN_FIELD_LEN]; |