Displaying 1 result from an estimated 1 matches for "e24b7aa368a0".
2013 Nov 11
0
[GIT PULL] (xen) stable/for-linus-3.13-rc0-tag
...r some time.
There is also an easy to resolve conflict with the ARM tree, and
Stephen Rothwell is carrying a patch:
arch/arm/include/asm/dma-mapping.h between commit 6a6a5c15d871 ("ARM:
7805/1: mm: change max*pfn to include the physical offset of memory")
from the arm tree and commit e24b7aa368a0 ("arm: make SWIOTLB available")
from the xen-tip tree.
See attached file.
arch/arm/Kconfig | 7 +
arch/arm/include/asm/dma-mapping.h | 46 ++++++-
arch/arm/include/asm/io.h | 9 ++
arch/arm/include/asm/xen/hypervisor.h |...