From: Bjorn Helgaas Date: Fri, 20 Dec 2013 19:41:40 +0000 (-0700) Subject: Merge branch 'pci/msi' into next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=47e0ab3f39aec53d9b7ac77dbe11a645e40583f9;p=deliverable%2Flinux.git Merge branch 'pci/msi' into next * pci/msi: PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int PCI/MSI: Return -ENOSYS for unimplemented interfaces, not -1 PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails s390/PCI: Remove superfluous check of MSI type s390/PCI: Fix single MSI only check PCI/MSI: Export MSI mode using attributes, not kobjects --- 47e0ab3f39aec53d9b7ac77dbe11a645e40583f9