diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-02-14 19:01:53 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-14 19:01:53 -0700 |
| commit | 7ddbc29fe4efea44e120c8dc085fa78fc28bb65f (patch) | |
| tree | 34e4692decb422461a719dafbeb7d4bc86535950 /include/linux/blkdev.h | |
| parent | 67b4110f8c8d16e588d7730db8e8b01b32c1bd8b (diff) | |
| parent | 8000d1fdb07e365e6565c2415aefdfed15413794 (diff) | |
Merge branch 'nvme-4.16-rc' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Keith:
"After syncing with Christoph and Sagi, we feel this is a good time to
send our latest fixes across most of the nvme components for 4.16"
* 'nvme-4.16-rc' of git://git.infradead.org/nvme:
nvme-rdma: fix sysfs invoked reset_ctrl error flow
nvmet: Change return code of discard command if not supported
nvme-pci: Fix timeouts in connecting state
nvme-pci: Remap CMB SQ entries on every controller reset
nvme: fix the deadlock in nvme_update_formats
nvme: Don't use a stack buffer for keep-alive command
nvme_fc: cleanup io completion
nvme_fc: correct abort race condition on resets
nvme: Fix discard buffer overrun
nvme: delete NVME_CTRL_LIVE --> NVME_CTRL_CONNECTING transition
nvme-rdma: use NVME_CTRL_CONNECTING state to mark init process
nvme: rename NVME_CTRL_RECONNECTING state to NVME_CTRL_CONNECTING
Diffstat (limited to 'include/linux/blkdev.h')
0 files changed, 0 insertions, 0 deletions