lkml.org 
[lkml]   [2010]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] memblock for 2.6.37
On Thu, Oct 21, 2010 at 5:50 PM, H. Peter Anvin <hpa@linux.intel.com> 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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-10-22 04:03    [W:0.143 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site