From: "herbert cland" <herbert.cland@gmail.com>
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: xen-devel <xen-devel@lists.xen.org>
Subject: Re: [qemu-upstream-unstable.git] is in CONFLICT state
Date: Thu, 13 Feb 2014 08:30:03 +0800 [thread overview]
Message-ID: <2014021308300156477455@gmail.com> (raw)
In-Reply-To: 1392210901.13563.70.camel@kazak.uk.xensource.com
[-- Attachment #1.1: Type: text/plain, Size: 1315 bytes --]
Sorry Ian and Every One, There is something wrong with my mailbox, and the mail repeated!
I am VERY sorry for wasting yours' time.
Please ignore this Message
herbert cland
From: Ian Campbell
Date: 2014-02-12 21:15
To: herbert cland
CC: xen-devel
Subject: Re: [Xen-devel] [qemu-upstream-unstable.git] is in CONFLICT state
On Wed, 2014-02-12 at 21:02 +0800, herbert cland wrote:
> Dear ALL!
>
> Following merge may be overwrite the "xen: Fix vcpu initialization"
So you've said three or four times now. There is no need to repeat
yourself like this, rest assured that your mails are in the relevant
people's inboxes and will be dealt with. Pestering in this way is just
rude.
> 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.
It's not clear to me how you have reached that conclusion. A merge
conflict could be down to numerous things, no all of which are "vcpu
hotplug patch was overwrited".
You'll have to be a lot more precise about what branch you are merging
into what other branch and what you think the undesirable fallout has
been I'm afraid.
Ian.
[-- Attachment #1.2: Type: text/html, Size: 3191 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 prev parent reply other threads:[~2014-02-13 0:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 13:02 [qemu-upstream-unstable.git] is in CONFLICT state herbert cland
2014-02-12 13:15 ` Ian Campbell
2014-02-13 0:30 ` herbert cland [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-12 9:25 herbert cland
2014-02-17 15:31 ` Anthony PERARD
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=2014021308300156477455@gmail.com \
--to=herbert.cland@gmail.com \
--cc=Ian.Campbell@citrix.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).