| |
|
 |
|
 |
|
|
|
| |
|
|
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: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx> |
|
Date: |
Fri, 22 Oct 2010 12:10:06 -0700 |
|
Cc: |
Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, "H. Peter Anvin" <hpa@xxxxxxxxx>, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Yinghai Lu <yinghai@xxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, Gianluca Guida <gianluca.guida@xxxxxxxxxx> |
|
Delivery-date: |
Fri, 22 Oct 2010 12:10:44 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
|
In-reply-to: |
<20101022140335.c4a3a48f.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> |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc13 Lightning/1.0b3pre Thunderbird/3.1.4 |
On 10/21/2010 08:03 PM, Stephen Rothwell wrote:
> Hi all,
>
> 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.
Hm, that change has been completely obsoleted by the memblock stuff from
tip. Oh, I see. Another change which ended up reverting that patch via
a merge got dropped, so it got left lying around. I'll pull it out.
(Not sure why it merges cleanly for me however; I guess because you've
already got the older xen branch in there which contains the merge.)
Anyway, update pushed.
J
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home