Re: linux-next: manual merge of the xen-tip tree with the arm-current tree

On Tue, 7 Jan 2014, Stephen Rothwell wrote: > 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

linux-next: manual merge of the xen-tip tree with the arm-current tree

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