Re: [PATCH 15/26] x86-64, NUMA: Unify the rest of memblk registration

[Ingo Molnar]

> > If you want the whole series reposted, please let me know.

Actually, it would be nice if you could merge your tree to the latest x86/mm tree i 
have just pushed out :-/

The problem is that your work is so wide that it conflicts with x86/mm, x86/bootmem, 
x86/amd-nb and x86/mm:

arch/x86/include/asm/amd_nb.h
arch/x86/include/asm/page_types.h
arch/x86/mm/amdtopology_64.c
arch/x86/mm/init_64.c
arch/x86/mm/numa_64.c
arch/x86/mm/srat_64.c

I consolidated all these topics into the generic x86/mm tree which you could use as 
a base.

I did not recognize the level of conflicts until i tried to pull your tree. You can 
generally test such interactions with other bits of the x86 tree by test-merging 
your pending work to tip:master.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/