This series bases on the series: https://patchwork.ozlabs.org/patch/713513. This series fixes couple of issues: * Remove WARN_ON() in pnv_php_put_slot(). The parent slot's refcount is decreased when releasing PCI slot. The parent slot can be NULL and no need to give a warning. * The MSI (or MSIx) could be enabled prior to load pnv-php.ko. A backtrace is thrown when phv-php.ko attempts to enable MSI again. PATCH[2/3] skips enabling surprise hotplug if MSI has been enabled by other driver. * PATCH[3/3] doesn't disable MSI that was enabled by other dirver. Also, the upstream port of the PCI slot is disabled when it's destroyed. Gavin Shan (3): pci/hotplug/pnv-php: Remove WARN_ON() in pnv_php_put_slot() pci/hotplug/pnv-php: Disable surprise hotplug capability on conflicts pci/hotplug/pnv-php: Disable MSI and PCI device properly drivers/pci/hotplug/pnv_php.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) -- 2.7.4