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
..
xen-pciback
xenbus
xenfs
acpi.c
balloon.c	xen: delete new instances of added __cpuinit	2013-11-08 15:13:16 -05:00
biomerge.c
cpu_hotplug.c
dbgp.c
events.c
evtchn.c	xen: remove deprecated IRQF_DISABLED	2013-11-06 15:31:16 -05:00
fallback.c
features.c
gntalloc.c
gntdev.c
grant-table.c	grant-table: call set_phys_to_machine after mapping grant refs	2013-10-25 10:41:44 +00:00
Kconfig	xen/arm,arm64: enable SWIOTLB_XEN	2013-10-10 13:40:44 +00:00
Makefile
manage.c
mcelog.c
pci.c	xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.	2013-11-08 15:12:52 -05:00
pcpu.c
platform-pci.c	xen: remove deprecated IRQF_DISABLED	2013-11-06 15:31:16 -05:00
privcmd.c
privcmd.h
swiotlb-xen.c	Merge remote-tracking branch 'stefano/swiotlb-xen-9.1' into stable/for-linus-3.13	2013-11-08 16:10:48 -05:00
sys-hypervisor.c
tmem.c
xen-acpi-cpuhotplug.c
xen-acpi-memhotplug.c
xen-acpi-pad.c
xen-acpi-processor.c
xen-balloon.c
xen-selfballoon.c
xen-stub.c
xencomm.c