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: Danger! [XenPPC] correct shadow2 merge conflict

To: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
Subject: Re: Danger! [XenPPC] correct shadow2 merge conflict
From: Hollis Blanchard <hollisb@xxxxxxxxxx>
Date: Wed, 23 Aug 2006 12:47:02 -0500
Cc: xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Wed, 23 Aug 2006 10:46:33 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
In-reply-to: <8F51F29A-762F-4AD0-94A9-6BE2088C74E0@xxxxxxxxxxxxxx>
List-help: <mailto:xen-ppc-devel-request@lists.xensource.com?subject=help>
List-id: Xen PPC development <xen-ppc-devel.lists.xensource.com>
List-post: <mailto:xen-ppc-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: IBM Linux Technology Center
References: <E1GFdz7-0007nE-9e@xxxxxxxxxxxxxxxxxxxxx> <8F51F29A-762F-4AD0-94A9-6BE2088C74E0@xxxxxxxxxxxxxx>
Sender: xen-ppc-devel-bounces@xxxxxxxxxxxxxxxxxxx
On Wed, 2006-08-23 at 06:21 -0400, Jimi Xenidis wrote:
> the push below does breaks domain building, unless there are  
> additional instructions missing somewhere.

Yup, a Linux change is needed. I'll push shortly; sorry about that.

> If you happened to pull/update, you can back out this patch with:
>    $ hg log -p -r 8fa42dd4c92a | patch -p1 -R

Since we're talking about committed changesets, there is no need for
this. Just 'hg update 5ec3af32d347', which is the last working
changeset. Later you can 'hg update' to get back to the tip. Using
changesets instead of the manual patching above ensures you don't get
diff or committ accidents.

Hollis Blanchard
IBM Linux Technology Center

Xen-ppc-devel mailing list