From: Joerg Roedel <jroedel@suse.de>
Date: Mon, 30 Jan 2017 14:58:47 +0000 (+0100)
Subject: Merge branch 'iommu/guest-msi' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Tag: v4.11-rc1~158^2^6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93fa6cf60aad833e7572a61f98b2d0aa6f67de40;p=thirdparty%2Fkernel%2Flinux.git

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

93fa6cf60aad833e7572a61f98b2d0aa6f67de40
diff --cc drivers/vfio/vfio_iommu_type1.c
index b3cc33fa6d26a,ec903a005faea..0f353f5195747
--- a/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>"