Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095fe49f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents a580657a 834814e8
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -207,9 +207,6 @@ static bool vfio_pci_nointx(struct pci_dev *pdev)
		}
	}

	if (!pdev->irq)
		return true;

	return false;
}