All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: bderzhavets@yahoo.com
Cc: Vegard Nossum <vegard.nossum@gmail.com>,
	Xen-devel <xen-devel@lists.xensource.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Ingo Molnar <mingo@elte.hu>,
	the arch/x86 maintainers <x86@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users"
Date: Mon, 16 Mar 2009 07:20:23 -0700	[thread overview]
Message-ID: <49BE6027.60805@goop.org> (raw)
In-Reply-To: <50370.4113.qm@web56105.mail.re3.yahoo.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: bderzhavets@yahoo.com
Cc: Xen-devel <xen-devel@lists.xensource.com>,
	Vegard Nossum <vegard.nossum@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	the arch/x86 maintainers <x86@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@elte.hu>
Subject: Re: Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users"
Date: Mon, 16 Mar 2009 07:20:23 -0700	[thread overview]
Message-ID: <49BE6027.60805@goop.org> (raw)
In-Reply-To: <50370.4113.qm@web56105.mail.re3.yahoo.com>

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

  reply	other threads:[~2009-03-16 14:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-14  7:04 tip.git regression from "vsprintf: unify the format decoding layer for its 3 users" Jeremy Fitzhardinge
2009-03-14  7:04 ` Jeremy Fitzhardinge
2009-03-14  9:43 ` Boris Derzhavets
2009-03-14 11:08 ` Vegard Nossum
2009-03-14 16:11   ` Jeremy Fitzhardinge
2009-03-14 16:11     ` Jeremy Fitzhardinge
2009-03-16 12:32     ` Boris Derzhavets
2009-03-16 14:20       ` Jeremy Fitzhardinge [this message]
2009-03-16 14:20         ` Jeremy Fitzhardinge
2009-03-16 15:05         ` how to enable shadow page table? Do I have to run HVM guest systems for shadow paging mode? Long Wang
2009-03-16 15:05           ` Long Wang
2009-03-16 16:05         ` Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users" Boris Derzhavets
2009-03-16 16:09           ` [Xen-devel] " Jeremy Fitzhardinge
2009-03-16 16:09             ` Jeremy Fitzhardinge
2009-03-16 17:48             ` Boris Derzhavets
2009-03-16 17:55               ` [Xen-devel] " Jeremy Fitzhardinge
2009-03-16 17:55                 ` Jeremy Fitzhardinge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49BE6027.60805@goop.org \
    --to=jeremy@goop.org \
    --cc=bderzhavets@yahoo.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=vegard.nossum@gmail.com \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.