From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Oct 2014 10:49:24 +0000 (-0400)
Subject: Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.18-rc1~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27a9716bc80448f7e98fb1fb316daba241a4c539;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:
 - Nested IOMMU extension to type1 (Will Deacon)
 - Restore MSIx message before enabling (Gavin Shan)
 - Fix remove path locking (Alex Williamson)

* tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Fix remove path locking
  drivers/vfio: Export vfio_spapr_iommu_eeh_ioctl() with GPL
  vfio/pci: Restore MSIx message prior to enabling
  PCI: Export MSI message relevant functions
  vfio/iommu_type1: add new VFIO_TYPE1_NESTING_IOMMU IOMMU type
  iommu: introduce domain attribute for nesting IOMMUs
---

27a9716bc80448f7e98fb1fb316daba241a4c539