From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 4 Apr 2018 18:27:46 +0000 (-0500)
Subject: Merge branch 'pci/msi'
X-Git-Tag: ceph-for-4.17-rc2~99^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac30aa596996a1e0bf1a8ff22bbdc24edaa24772;p=ceph-client.git

Merge branch 'pci/msi'

  - don't set up INTx if MSI or MSI-X is enabled to align cris, frv, ia64,
    and mn10300 with x86 (Bjorn Helgaas)

* pci/msi:
  PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled
---

ac30aa596996a1e0bf1a8ff22bbdc24edaa24772