Messages in this thread | | | Date | Mon, 16 Mar 2009 07:20:23 -0700 | From | Jeremy Fitzhardinge <> | Subject | Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users" |
| |
Boris Derzhavets wrote: > What is the issue status in meantime ? > git pull reports conflicting merge ./lib/vsprintf.c > PV DomUs may be brought up , but cannot be > shutdown. >
Do a "git checkout xen/dom0/hackery; git reset --hard remotes/xen/xen/dom0/hackery" to rebase your local hackery branch to the upstream one. I did a bit of a history-rewrite to replace the reverts with the proper fix.
J
| |