From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2018 18:18:43 +0000 (-0700)
Subject: Merge tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.16-rc7~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=095fe49fd559f0b98e4cb396e235d32909a0eacc;p=thirdparty%2Flinux.git

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"
---

095fe49fd559f0b98e4cb396e235d32909a0eacc