From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 9 Mar 2018 02:12:59 +0000 (-0700)
Subject: Merge branch 'nvme-4.16-rc5' of git://git.infradead.org/nvme into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e576b7b528bb4c352ab2b9fbdaa6124f0ae82e1d;p=linux.git

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

Pull NVMe fixes for this series from Keith:

"A few late fixes for 4.16:

 * Reverting sysfs slave device links for native nvme multipathing.
   The hidden disk attributes broke common user tools.

 * A fix for a PPC pci error handling regression.

 * Update pci interrupt count to consider the actual IRQ spread, fixing
   potentially poor initial queue affinity.

 * Off-by-one errors in nvme-fc queue sizes

 * A fabrics discovery fix to be more tolerant with user tools."

* 'nvme-4.16-rc5' of git://git.infradead.org/nvme:
  nvme_fc: rework sqsize handling
  nvme-fabrics: Ignore nr_io_queues option for discovery controllers
  Revert "nvme: create 'slaves' and 'holders' entries for hidden controllers"
  nvme: pci: pass max vectors as num_possible_cpus() to pci_alloc_irq_vectors
  nvme-pci: Fix EEH failure on ppc
---

e576b7b528bb4c352ab2b9fbdaa6124f0ae82e1d