From: "herbert cland" <herbert.cland@gmail.com>
To: xen-devel <xen-devel@lists.xen.org>
Subject: [qemu-upstream-unstable.git] is in CONFLICT state
Date: Wed, 12 Feb 2014 17:25:58 +0800 [thread overview]
Message-ID: <2014021217255231643849@gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 349 bytes --]
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.
herbert cland
[-- Attachment #1.2: Type: text/html, Size: 1374 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2014-02-12 9:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 9:25 herbert cland [this message]
2014-02-17 15:31 ` [qemu-upstream-unstable.git] is in CONFLICT state Anthony PERARD
-- 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=2014021217255231643849@gmail.com \
--to=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).