This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


Re: [Xen-devel] xen pv_ops git merge conflicts unresolved?

To: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Subject: Re: [Xen-devel] xen pv_ops git merge conflicts unresolved?
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Tue, 03 Mar 2009 09:33:42 -0800
Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, "Marc - A. Dahlhaus \[ Administration | Westermann GmbH \]" <mad@xxxxxx>
Delivery-date: Tue, 03 Mar 2009 09:34:08 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1236085719.25103.79.camel@xxxxxxxxxxxxxxxxxxxxxx>
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: <1236075257.6787.7.camel@marc> <1236085719.25103.79.camel@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Thunderbird (X11/20090105)
Ian Campbell wrote:
On Tue, 2009-03-03 at 05:14 -0500, Marc - A. Dahlhaus [ Administration |
Westermann GmbH ] wrote:
Hello Jeremy,

it looks like there were some merge conflicts yesterday on the following
commits/files and they didn't got resolved properly...

The below fixes the 32 bit build for me although I still get a crash on

Thanks for the fixup. I probably shouldn't have been operating machinery yesterday.

The crash is probably because I committed the e820 memory rearranging stuff into the wrong branch, but something may have broken us from tip/master as well.


Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>