From mboxrd@z Thu Jan 1 00:00:00 1970 From: "herbert cland" Subject: Re: [qemu-upstream-unstable.git] is in CONFLICT state Date: Thu, 13 Feb 2014 08:30:03 +0800 Message-ID: <2014021308300156477455@gmail.com> References: <2014021221022931163650@gmail.com>, <1392210901.13563.70.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8401865117394408970==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --===============8401865117394408970== Content-Type: multipart/alternative; boundary="----=_001_NextPart166467430317_=----" This is a multi-part message in MIME format. ------=_001_NextPart166467430317_=---- Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 U29ycnkgSWFuIGFuZCBFdmVyeSBPbmUsICBUaGVyZSBpcyBzb21ldGhpbmcgd3Jvbmcgd2l0aCBt eSBtYWlsYm94LCBhbmQgdGhlIG1haWwgcmVwZWF0ZWQhDQpJIGFtIFZFUlkgc29ycnkgZm9yIHdh c3RpbmcgeW91cnMnIHRpbWUuDQpQbGVhc2UgaWdub3JlIHRoaXMgTWVzc2FnZSAgDQoNCg0KDQoN CmhlcmJlcnQgY2xhbmQNCg0KRnJvbTogSWFuIENhbXBiZWxsDQpEYXRlOiAyMDE0LTAyLTEyIDIx OjE1DQpUbzogaGVyYmVydCBjbGFuZA0KQ0M6IHhlbi1kZXZlbA0KU3ViamVjdDogUmU6IFtYZW4t ZGV2ZWxdIFtxZW11LXVwc3RyZWFtLXVuc3RhYmxlLmdpdF0gaXMgaW4gQ09ORkxJQ1Qgc3RhdGUN Ck9uIFdlZCwgMjAxNC0wMi0xMiBhdCAyMTowMiArMDgwMCwgaGVyYmVydCBjbGFuZCB3cm90ZToN Cj4gRGVhciBBTEwhDQo+ICANCj4gRm9sbG93aW5nIG1lcmdlIG1heSBiZSBvdmVyd3JpdGUgdGhl ICJ4ZW46IEZpeCB2Y3B1IGluaXRpYWxpemF0aW9uIg0KDQpTbyB5b3UndmUgc2FpZCB0aHJlZSBv ciBmb3VyIHRpbWVzIG5vdy4gVGhlcmUgaXMgbm8gbmVlZCB0byByZXBlYXQNCnlvdXJzZWxmIGxp a2UgdGhpcywgcmVzdCBhc3N1cmVkIHRoYXQgeW91ciBtYWlscyBhcmUgaW4gdGhlIHJlbGV2YW50 DQpwZW9wbGUncyBpbmJveGVzIGFuZCB3aWxsIGJlIGRlYWx0IHdpdGguIFBlc3RlcmluZyBpbiB0 aGlzIHdheSBpcyBqdXN0DQpydWRlLg0KDQo+ICBwYXRjaA0KPiAtLS0tLS0tLS0tLS0tLS0tLS0t LQ0KPiBNZXJnZSByZW1vdGUgYnJhbmNoICdvcmlnaW4vc3RhYmxlLTEuNicgaW50byB4ZW4tc3Rh Z2luZy1tYXN0ZXItOSANCj4gLS0tLS0tLS0tLS0tLS0tLS0tLS0gDQo+ICANCj4gVGhpcyBtYWRl IGEgY29uZmxpY3QgZm9yIHhlbi1hbGwuYy4NCj4gU28gaXQgc2VlbXMgdGhhdCB0aGUgdnBjdSBo b3RwbHVnIHBhdGNoIHdhcyBvdmVyd3JpdGVkIGJ5IHRoZSB1cHN0cmVhbQ0KPiBxZW11IHZlcnNp b24uDQoNCkl0J3Mgbm90IGNsZWFyIHRvIG1lIGhvdyB5b3UgaGF2ZSByZWFjaGVkIHRoYXQgY29u Y2x1c2lvbi4gQSBtZXJnZQ0KY29uZmxpY3QgY291bGQgYmUgZG93biB0byBudW1lcm91cyB0aGlu Z3MsIG5vIGFsbCBvZiB3aGljaCBhcmUgInZjcHUNCmhvdHBsdWcgcGF0Y2ggd2FzIG92ZXJ3cml0 ZWQiLg0KDQpZb3UnbGwgaGF2ZSB0byBiZSBhIGxvdCBtb3JlIHByZWNpc2UgYWJvdXQgd2hhdCBi cmFuY2ggeW91IGFyZSBtZXJnaW5nDQppbnRvIHdoYXQgb3RoZXIgYnJhbmNoIGFuZCB3aGF0IHlv dSB0aGluayB0aGUgdW5kZXNpcmFibGUgZmFsbG91dCBoYXMNCmJlZW4gSSdtIGFmcmFpZC4NCg0K SWFuLg== ------=_001_NextPart166467430317_=---- Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable =EF=BB=BF
Sorry Ian and Every One,  There is something wrong with my mailb= ox,=20 and the mail repeated!
I am VERY sorry for wasting yours' time.
Please ignore this Message  
 
herbert cland
 
Date: 2014-02-12 21:15
CC: xen-devel
Subject: Re: [Xen-devel] [qemu-upstream-unstable.git] is = in=20 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=20 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<= /DIV>
people's inboxes and will be dealt with. Pestering in this way is=20 just
rude.
 
>  patch
> --------------------
> Merge remote branch 'origin/stable-1.6' into xen-staging-master-= 9=20
> --------------------
> 
> This made a conflict for xen-all.c.
> So it seems that the vpcu hotplug patch was overwrited by the=20 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<= /DIV>
hotplug patch was overwrited".
 
You'll have to be a lot more precise about what branch you are=20 merging
into what other branch and what you think the undesirable fallout has=
been I'm afraid.
 
Ian.
 
 
------=_001_NextPart166467430317_=------ --===============8401865117394408970== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8401865117394408970==--