Merge tag 'vfio-v4.7-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 16:47:26 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 16:47:26 +0000 (09:47 -0700)
commit48dd7cefa010b704eb2532a2883798fd6d703a0e
treeb225984502abd725a292122d1209e716894fafe4
parentb462b37b08be1b6a4e380d78b978ec1ff84e2783
parentf70552809419cd2abc0cc6469a07c9792a3aaa6c
Merge tag 'vfio-v4.7-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Hide INTx on certain known broken devices (Alex Williamson)

 - Additional backdoor reset detection (Alex Williamson)

 - Remove unused iommudata reference (Alexey Kardashevskiy)

 - Use cfg_size to avoid probing extended config space (Alexey
   Kardashevskiy)

* tag 'vfio-v4.7-rc1' of git://github.com/awilliam/linux-vfio:
  vfio_pci: Test for extended capabilities if config space > 256 bytes
  vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata
  vfio/pci: Add test for BAR restore
  vfio/pci: Hide broken INTx support from user
drivers/vfio/vfio_iommu_spapr_tce.c