Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Thu, 10 Jan 2019 22:29:57 +0000 (15:29 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 10 Jan 2019 22:29:57 +0000 (15:29 -0700)
commita39c330d7436530151a619319f7ff6e9b3a6d8c6
tree72897be498ee7874994002a988304327d9aabd28
parent5db470e229e22b7eda6e23b5566e532c96fb5bc3
parentb8a38ea64dc714a64f8fb76e311a4f15a3f67861
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