lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the xen tree with the tip tree
On 10/21/2010 08:36 PM, Stephen Rothwell wrote:
> Hi Jeremy,
>
> On Fri, 22 Oct 2010 14:03:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the xen tree got a conflict in
>> arch/x86/mm/init_32.c between commit
>> 1d931264af0f10649b35afa8fbd2e169da51ac08 ("x86-32, memblock: Make
>> add_highpages honor early reserved ranges") from the tip tree and commit
>> 07147a06ac3b1b028124ea00ba44e69eb8ea7685 ("x86/32: honor reservations of
>> high memory") from the xen tree.
>>
>> I have no idea how to fix this up, sorry, so I have used the xen tree
>> from next-20101021 for today.
>

x86-32, memblock: Make add_highpages honor early reserved ranges

is updated version with memblock for

x86/32: honor reservations of high memory

Assume Jeremy would update the xen tree.

Thanks

Yinghai



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