* [qemu-upstream-unstable.git] is in CONFLICT state
@ 2014-02-12 13:02 herbert cland
2014-02-12 13:15 ` Ian Campbell
0 siblings, 1 reply; 6+ messages in thread
From: herbert cland @ 2014-02-12 13:02 UTC (permalink / raw)
To: xen-devel
[-- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [qemu-upstream-unstable.git] is in CONFLICT state
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
0 siblings, 1 reply; 6+ messages in thread
From: Ian Campbell @ 2014-02-12 13:15 UTC (permalink / raw)
To: herbert cland; +Cc: xen-devel
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [qemu-upstream-unstable.git] is in CONFLICT state
2014-02-12 13:15 ` Ian Campbell
@ 2014-02-13 0:30 ` herbert cland
0 siblings, 0 replies; 6+ messages in thread
From: herbert cland @ 2014-02-13 0:30 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
[-- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [qemu-upstream-unstable.git] is in CONFLICT state
@ 2014-02-12 9:25 herbert cland
2014-02-17 15:31 ` Anthony PERARD
0 siblings, 1 reply; 6+ messages in thread
From: herbert cland @ 2014-02-12 9:25 UTC (permalink / raw)
To: xen-devel
[-- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [qemu-upstream-unstable.git] is in CONFLICT state
2014-02-12 9:25 herbert cland
@ 2014-02-17 15:31 ` Anthony PERARD
0 siblings, 0 replies; 6+ messages in thread
From: Anthony PERARD @ 2014-02-17 15:31 UTC (permalink / raw)
To: herbert cland; +Cc: xen-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [qemu-upstream-unstable.git] is in CONFLICT state
@ 2014-02-12 9:14 herbert cland
0 siblings, 0 replies; 6+ messages in thread
From: herbert cland @ 2014-02-12 9:14 UTC (permalink / raw)
To: xen-devel
[-- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-17 15:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- 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
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).