Merge branch 'pci/msi' into next

Browse source

* pci/msi:
  s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
  Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
  PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits

...

This commit is contained in:

Bjorn Helgaas 2014-11-21 10:11:33 -07:00

parent 18e88beceb f833869427

commit 149792795d

6 changed files with 20 additions and 46 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/linux/msi.h

View file