From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 10 Jan 2019 22:29:57 +0000 (-0700)
Subject: Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v5.0-rc2~10^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a39c330d7436530151a619319f7ff6e9b3a6d8c6;p=users%2Fjedix%2Flinux-maple.git

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

Pull NVMe fixes from Christoph.

* 'nvme-5.0' of git://git.infradead.org/nvme:
  nvme: don't initlialize ctrl->cntlid twice
  nvme: introduce NVME_QUIRK_IGNORE_DEV_SUBNQN
  nvme: pad fake subsys NQN vid and ssvid with zeros
  nvme-multipath: zero out ANA log buffer
  nvme-fabrics: unset write/poll queues for discovery controllers
  nvme-tcp: don't ask if controller is fabrics
  nvme-tcp: remove dead code
  nvme-pci: fix out of bounds access in nvme_cqe_pending
  nvme-pci: rerun irq setup on IO queue init errors
  nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
  nvme-pci: fix the wrong setting of nr_maps
---

a39c330d7436530151a619319f7ff6e9b3a6d8c6