From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 15 Feb 2018 02:01:53 +0000 (-0700)
Subject: Merge branch 'nvme-4.16-rc' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v4.16-rc2~5^2~1
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7ddbc29fe4efea44e120c8dc085fa78fc28bb65f

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
---

7ddbc29fe4efea44e120c8dc085fa78fc28bb65f