On Thu, Oct 21, 2010 at 5:50 PM, H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> wrote:
>
> The unmerged branch is at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-memblock-for-linus
>
> The premerged branch is at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-memblock-for-linus-merged
I always tend to take the unmerged version, because I want to see what
the conflicts are (it gives me some view of what clashes), but when
people do pre-merges I then try to compare my merge against theirs.
However, in this case, your pre-merged version differs. But I think
it's your merge that was incorrect. You left this line:
obj-$(CONFIG_HAVE_EARLY_RES) += early_res.o
in kernel/Makefile, even though kernel/early_res.c is gone.
I'll push out my merge, but please do verify that it all looks ok.
Linus
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxxx For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href