Merge branch 'swiotlb-xen' into xentip/linux-next

Conflicts:
	drivers/xen/swiotlb-xen.c

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc drivers/xen/swiotlb-xen.c
index 44af9d8577ded149a0cd95926372505e6bc232e7,8af68629260bc9dce0287a61c21e706c8fada915..7ca9621a7883df203f9e7b8a8df2f8ba072e6712
--- 1/drivers/xen/swiotlb-xen.c
--- 2/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@@ -42,8 -42,8 +42,10 @@@
  #include <xen/page.h>
  #include <xen/xen-ops.h>
  #include <xen/hvc-console.h>
+ #include <asm/dma-mapping.h>
+ #include <asm/xen/page-coherent.h>
 +
 +#include <trace/events/swiotlb.h>
  /*
   * Used to do a quick range check in swiotlb_tbl_unmap_single and
   * swiotlb_tbl_sync_single_*, to see if the memory was in fact allocated by this

diff --cc lib/swiotlb.c
Simple merge