Konrad Rzeszutek Wilk e1d8f62ad4 Merge remote-tracking branch 'stefano/swiotlb-xen-9.1' into stable/for-linus-3.13 ... * stefano/swiotlb-xen-9.1: swiotlb-xen: fix error code returned by xen_swiotlb_map_sg_attrs swiotlb-xen: static inline xen_phys_to_bus, xen_bus_to_phys, xen_virt_to_bus and range_straddles_page_boundary grant-table: call set_phys_to_machine after mapping grant refs arm,arm64: do not always merge biovec if we are running on Xen swiotlb: print a warning when the swiotlb is full swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device swiotlb-xen: use xen_alloc/free_coherent_pages xen: introduce xen_alloc/free_coherent_pages arm64/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain arm/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain swiotlb-xen: introduce xen_swiotlb_set_dma_mask xen/arm,arm64: enable SWIOTLB_XEN xen: make xen_create_contiguous_region return the dma address xen/x86: allow __set_phys_to_machine for autotranslate guests arm/xen,arm64/xen: introduce p2m arm64: define DMA_ERROR_CODE arm: make SWIOTLB available Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Conflicts: arch/arm/include/asm/dma-mapping.h drivers/xen/swiotlb-xen.c [Conflicts arose b/c "arm: make SWIOTLB available" v8 was in Stefano's branch, while I had v9 + Ack from Russel. I also fixed up white-space issues]		2013-11-08 16:10:48 -05:00
..
enlighten.c	Linux 3.11-rc7	2013-09-09 12:05:37 -04:00
grant-table.c	xen: grant: use xen_pfn_t type for frame_list.	2012-10-19 15:17:55 -04:00
hypercall.S	xen/arm and xen/arm64: implement HYPERVISOR_tmem_op	2013-07-04 11:41:12 +00:00
Makefile	xen/arm,arm64: enable SWIOTLB_XEN	2013-10-10 13:40:44 +00:00
mm.c	swiotlb-xen: use xen_alloc/free_coherent_pages	2013-10-10 13:41:10 +00:00
p2m.c	Merge remote-tracking branch 'stefano/swiotlb-xen-9.1' into stable/for-linus-3.13	2013-11-08 16:10:48 -05:00