| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] Re: linux-next: manual merge of the xen tree with the tip tr
|
To: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Subject: |
[Xen-devel] Re: linux-next: manual merge of the xen tree with the tip tree |
|
From: |
Yinghai Lu <yinghai@xxxxxxxxxx> |
|
Date: |
Thu, 21 Oct 2010 21:03:19 -0700 |
|
Cc: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, "H. Peter Anvin" <hpa@xxxxxxxxx>, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, Gianluca Guida <gianluca.guida@xxxxxxxxxx> |
|
Delivery-date: |
Thu, 21 Oct 2010 21:05:40 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
|
In-reply-to: |
<20101022143607.132d381c.sfr@xxxxxxxxxxxxxxxx> |
|
List-help: |
<mailto:xen-devel-request@lists.xensource.com?subject=help> |
|
List-id: |
Xen developer discussion <xen-devel.lists.xensource.com> |
|
List-post: |
<mailto:xen-devel@lists.xensource.com> |
|
List-subscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
|
List-unsubscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
|
References: |
<20101022140335.c4a3a48f.sfr@xxxxxxxxxxxxxxxx> <20101022143607.132d381c.sfr@xxxxxxxxxxxxxxxx> |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.12) Gecko/20100914 SUSE/3.0.8 Thunderbird/3.0.8 |
On 10/21/2010 08:36 PM, Stephen Rothwell wrote:
> Hi Jeremy,
>
> On Fri, 22 Oct 2010 14:03:35 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home