[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users"
- To: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
- From: Boris Derzhavets <bderzhavets@xxxxxxxxx>
- Date: Mon, 16 Mar 2009 09:05:25 -0700 (PDT)
- Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, Vegard Nossum <vegard.nossum@xxxxxxxxx>, Frederic Weisbecker <fweisbec@xxxxxxxxx>, the arch/x86 maintainers <x86@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>
- Delivery-date: Mon, 16 Mar 2009 09:05:54 -0700
- Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=jdEB9K8Z81hZ8OQ07rOW2SQ5bddfb7CKbrk9z1OyTKH1HEtaKmLG7upoq74JdSyJLvH1+8labZQAXfMgw4U4qbXl0Oz/IZl7NGmhdZAVUjHMZZNs9yfA4bVcq+ElK6F8Krxp1s8JW8rkjm91VaxU4tbsT+/brvXbCE09jEnFICg=;
- List-id: Xen developer discussion <xen-devel.lists.xensource.com>
It's not working:-
root@ServerIntrepid:/usr/src/linux-2.6-xen# git checkout xen/dom0/hackery
Already on "xen/dom0/hackery"
root@ServerIntrepid:/usr/src/linux-2.6-xen# git reset --hard remotes/xen/xen/dom0/hackery
fatal: ambiguous argument 'remotes/xen/xen/dom0/hackery': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions
Boris
--- On Mon, 3/16/09, Jeremy Fitzhardinge <jeremy@xxxxxxxx> wrote:
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Subject: Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users"
To: bderzhavets@xxxxxxxxx
Cc: "Xen-devel" <xen-devel@xxxxxxxxxxxxxxxxxxx>, "Vegard Nossum"
<vegard.nossum@xxxxxxxxx>, "Frederic Weisbecker" <fweisbec@xxxxxxxxx>, "the arch/x86 maintainers" <x86@xxxxxxxxxx>, "Linux Kernel Mailing List" <linux-kernel@xxxxxxxxxxxxxxx>, "Ingo Molnar" <mingo@xxxxxxx>
Date: Monday, March 16, 2009, 10:20 AM
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
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
