diff options
| author | Jens Axboe <axboe@fb.com> | 2016-12-22 11:54:46 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-12-22 11:54:46 -0700 |
| commit | 8e5d31eb02c08d94262e1281adc8574134af65fd (patch) | |
| tree | e4e0dce124a26a5618fa5a8e722f5744d02d72d2 /drivers/nvme/host/nvme.h | |
| parent | 72c5296f9d64d8f5f27c2133e5f108a45a353d71 (diff) | |
| parent | 7c3a23b85cac5f3caa531f369c1e3a5f1a8b555f (diff) | |
Merge branch 'nvme-4.10' of git://git.infradead.org/nvme into for-linus
Christoph writes:
The most significant one is that we've agreed on shared maintaince and
a common repository for the PCIe NVMe driver and NVMe over Fabrics. The
target code still only has a subset of the maintainers but goes through
the same tree as well. Keith, Sagi and me will take turns at collecting
patches and sending you pull requests.
Diffstat (limited to 'drivers/nvme/host/nvme.h')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index bd5321441d12..6377e14586dc 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -135,7 +135,6 @@ struct nvme_ctrl { u32 page_size; u32 max_hw_sectors; - u32 stripe_size; u16 oncs; u16 vid; atomic_t abort_limit; |