Hi all, Today's linux-next merge of the xen-tip tree got a conflict in arch/arm/include/asm/xen/page.h between commit 0a5ccc86507f ("ARM: 7933/1: rename ioremap_cached to ioremap_cache") from the tree and commit 02bcf053e9c5 ("asm/xen/page.h: remove redundant semicolon") from the xen-tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/include/asm/xen/page.h index 3759cacdd7f8,709c4b4d2f1d..000000000000 --- a/arch/arm/include/asm/xen/page.h +++ b/arch/arm/include/asm/xen/page.h @@@ -117,6 -117,7 +117,7 @@@ static inline bool set_phys_to_machine( return __set_phys_to_machine(pfn, mfn); } - #define xen_remap(cookie, size) ioremap_cache((cookie), (size)); -#define xen_remap(cookie, size) ioremap_cached((cookie), (size)) ++#define xen_remap(cookie, size) ioremap_cache((cookie), (size)) + #define xen_unmap(cookie) iounmap((cookie)) #endif /* _ASM_ARM_XEN_PAGE_H */