Re: Danger! [XenPPC] correct shadow2 merge conflict

[Hollis Blanchard <hollisb@xxxxxxxxxx>]

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
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel