From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: xen pv_ops git merge conflicts unresolved?
Date: Tue, 03 Mar 2009 09:33:42 -0800
Message-ID: <49AD69F6.2070200@goop.org>
References: <1236075257.6787.7.camel@marc>
	<1236085719.25103.79.camel@zakaz.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <1236085719.25103.79.camel@zakaz.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>, "Marc - A. Dahlhaus [ Administration | Westermann GmbH ]" <mad@wol.de>
List-Id: xen-devel@lists.xenproject.org

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

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.

    J