lkml.org 
[lkml]   [2010]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] memblock for 2.6.37
On 10/21/2010 06:59 PM, Linus Torvalds wrote:
> 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.
>

Sounds like a very good idea. I'll take it as a request to continue to
do both if there are anything but trivial conflicts.


> 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
>

You're right, my mistake. Thanks for checking and fixing it up.

I will pull your tree later and test if and add the fixes for the other
trees.

-hpa

--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.



\
 
 \ /
  Last update: 2010-10-22 04:55    [from the cache]
©2003-2011 Jasper Spaans