Merge branch 'irq/urgent' into irq/msi

to pick up the PCI/MSI-x fixes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc drivers/pci/msi/msi.c
index 8b4d529792a6adc1e52193f73fa8e3c64ebc0067,d84cf30bb279086cc5b23ac8692c0b8987eba8c6..eb917fecf3cf3e645ea3ee564ae60ab3eb34725f
--- 1/drivers/pci/msi/msi.c
--- 2/drivers/pci/msi.c
+++ b/drivers/pci/msi/msi.c
@@@ -598,14 -722,9 +598,11 @@@ static int msix_capability_init(struct 
                goto out_disable;
        }
  
-       /* Ensure that all table entries are masked. */
-       msix_mask_all(base, tsize);
- 
 +      dev->msix_base = base;
 +
        ret = msix_setup_entries(dev, base, entries, nvec, affd);
        if (ret)
 -              goto out_disable;
 +              goto out_free;
  
        ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
        if (ret)