From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 5 Oct 2018 14:15:12 +0000 (-0600)
Subject: Merge branch 'nvme-4.20' of git://git.infradead.org/nvme into for-4.20/block
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4f5735f3884f9504fee5602aa8805d7695aa0f74;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'nvme-4.20' of git://git.infradead.org/nvme into for-4.20/block

Pull NVMe updates from Christoph:

"A relatively boring merge window:

 - better AEN tracing (Chaitanya)
 - NUMA aware PCIe multipathing (me)
 - RDMA workqueue fixes (Sagi)
 - better bio usage in the target (Sagi)
 - FC rework for target removal (James)
 - better multipath handling of ->queue_rq failures (James)
 - various cleanups (Milan)"

* 'nvme-4.20' of git://git.infradead.org/nvme:
  nvmet-rdma: use a private workqueue for delete
  nvme: take node locality into account when selecting a path
  nvmet: don't split large I/Os unconditionally
  nvme: call nvme_complete_rq when nvmf_check_ready fails for mpath I/O
  nvme-core: add async event trace helper
  nvme_fc: add 'nvme_discovery' sysfs attribute to fc transport device
  nvmet_fc: support target port removal with nvmet layer
  nvme-fc: fix for a minor typos
  nvmet: remove redundant module prefix
  nvme: fix typo in nvme_identify_ns_descs
---

4f5735f3884f9504fee5602aa8805d7695aa0f74