Hi Avi,
Today's linux-next merge of the kvm tree got a trivial conflict in
drivers/pci/dmar.c between commit
fe962e90cb17a8426e144dee970e77ed789d98ee ("x64, x2apic/intr-remap: Queued
invalidation infrastructure (part of VT-d)") from the x86 tree and commit
14f776b8e0aa6724069a35bf4e172d93be74ba90 ("VT-d: Changes to support KVM")
from the kvm tree.
The former just changed the context of the latter. I fixed it up (see
below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/pci/dmar.c
index 9527405,1df28ea..0000000
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -28,9 -26,8 +28,9 @@@
#include <linux/pci.h>
#include <linux/dmar.h>
+#include <linux/timer.h>
- #include "iova.h"
- #include "intel-iommu.h"
+ #include <linux/iova.h>
+ #include <linux/intel-iommu.h>
#undef PREFIX
#define PREFIX "DMAR:"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
