Merge tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2018 18:18:43 +0000 (11:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2018 18:18:43 +0000 (11:18 -0700)
commit095fe49fd559f0b98e4cb396e235d32909a0eacc
tree681a2935bab9a0e7beff03fd9d1725531b554af9
parenta580657ad7dc1f4c7e98cc1450c961dccfc52aab
parent834814e80268c818f354c8f402e0c6604ed75589
Merge tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "Revert masking INTx where it cannot be enabled - it plays poorly with
  SR-IOV VFs and presumes DisINTx support"

* tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio:
  Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it"