Hi Andrew, Today's linux-next merge of the akpm tree got conflicts in: arch/x86/mm/init.c arch/x86/mm/ioremap.c between commit: 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree and patch: "x86: use set_memory.h header" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/x86/mm/init.c index 2193799ca800,adbfb095bade..000000000000 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@@ -5,8 -5,8 +5,8 @@@ #include <linux/memblock.h> #include <linux/bootmem.h> /* for max_low_pfn */ - #include <asm/cacheflush.h> + #include <asm/set_memory.h> -#include <asm/e820.h> +#include <asm/e820/api.h> #include <asm/init.h> #include <asm/page.h> #include <asm/page_types.h> diff --cc arch/x86/mm/ioremap.c index e4f7b25df18e,1924c4ab8be5..000000000000 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@@ -14,8 -13,8 +14,8 @@@ #include <linux/vmalloc.h> #include <linux/mmiotrace.h> - #include <asm/cacheflush.h> + #include <asm/set_memory.h> -#include <asm/e820.h> +#include <asm/e820/api.h> #include <asm/fixmap.h> #include <asm/pgtable.h> #include <asm/tlbflush.h> -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html