Merge branch 'iommu/guest-msi' of git://git.kernel.org/pub/scm/linux/kernel/git/will...

diff --cc drivers/vfio/vfio_iommu_type1.c
index b3cc33fa6d26a69f44dc013b7bee55f6bd7682ab,ec903a005faea6de3501a0f7e1d6a5ac157e7abd..0f353f5195747e7a3589666fb81d469664773a19
--- 1/drivers/vfio/vfio_iommu_type1.c
--- 2/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@@ -36,8 -36,11 +36,10 @@@
  #include <linux/uaccess.h>
  #include <linux/vfio.h>
  #include <linux/workqueue.h>
 -#include <linux/pid_namespace.h>
  #include <linux/mdev.h>
  #include <linux/notifier.h>
+ #include <linux/dma-iommu.h>
+ #include <linux/irqdomain.h>
  
  #define DRIVER_VERSION  "0.2"
  #define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"