From: Anthony PERARD <anthony.perard@citrix.com>
To: herbert cland <herbert.cland@gmail.com>
Cc: xen-devel <xen-devel@lists.xen.org>
Subject: Re: [qemu-upstream-unstable.git] is in CONFLICT state
Date: Mon, 17 Feb 2014 15:31:00 +0000 [thread overview]
Message-ID: <20140217153100.GA26280@perard.uk.xensource.com> (raw)
In-Reply-To: <2014021217255231643849@gmail.com>
On Wed, Feb 12, 2014 at 05:25:58PM +0800, herbert cland wrote:
> Dear ALL!
>
> Following merge may be overwrite the "xen: Fix vcpu initialization" patch
> --------------------
> Merge remote branch 'origin/stable-1.6' into xen-staging-master-9
> --------------------
>
> This made a conflict for xen-all.c.
> So it seems that the vpcu hotplug patch was overwrited by the upstream qemu version.
Thanks, I will look into this issue.
Regards,
--
Anthony PERARD
next prev parent reply other threads:[~2014-02-17 15:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 9:25 [qemu-upstream-unstable.git] is in CONFLICT state herbert cland
2014-02-17 15:31 ` Anthony PERARD [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-12 13:02 herbert cland
2014-02-12 13:15 ` Ian Campbell
2014-02-13 0:30 ` herbert cland
2014-02-12 9:14 herbert cland
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=20140217153100.GA26280@perard.uk.xensource.com \
--to=anthony.perard@citrix.com \
--cc=herbert.cland@gmail.com \
--cc=xen-devel@lists.xen.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).