From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 22 Jun 2018 14:45:29 +0000 (-0600)
Subject: Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f9da9d0786735850e9bfad362cfc0da200effb46;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus

Pull NVMe fixes from Christoph:

"Various relatively small fixes, mostly to fix error handling of various
 sorts."

* 'nvme-4.18' of git://git.infradead.org/nvme:
  nvme-pci: limit max IO size and segments to avoid high order allocations
  nvme-pci: move nvme_kill_queues to nvme_remove_dead_ctrl
  nvme-fc: release io queues to allow fast fail
  nvmet: reset keep alive timer in controller enable
  nvme-rdma: don't override opts->queue_size
  nvme-rdma: Fix command completion race at error recovery
  nvme-rdma: fix possible free of a non-allocated async event buffer
  nvme-rdma: fix possible double free condition when failing to create a controller
---

f9da9d0786735850e9bfad362cfc0da200effb46