From mboxrd@z Thu Jan 1 00:00:00 1970 From: "herbert cland" Subject: [qemu-upstream-unstable.git] is in CONFLICT state Date: Wed, 12 Feb 2014 17:25:58 +0800 Message-ID: <2014021217255231643849@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0689713517071110766==" 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: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --===============0689713517071110766== Content-Type: multipart/alternative; boundary="----=_001_NextPart205340081584_=----" This is a multi-part message in MIME format. ------=_001_NextPart205340081584_=---- Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: base64 RGVhciBBTEwhDQoNCkZvbGxvd2luZyBtZXJnZSBtYXkgYmUgb3ZlcndyaXRlIHRoZSAieGVuOiBG aXggdmNwdSBpbml0aWFsaXphdGlvbiIgcGF0Y2gNCi0tLS0tLS0tLS0tLS0tLS0tLS0tDQpNZXJn ZSByZW1vdGUgYnJhbmNoICdvcmlnaW4vc3RhYmxlLTEuNicgaW50byB4ZW4tc3RhZ2luZy1tYXN0 ZXItOSANCi0tLS0tLS0tLS0tLS0tLS0tLS0tIA0KDQpUaGlzIG1hZGUgYSBjb25mbGljdCBmb3Ig eGVuLWFsbC5jLg0KU28gaXQgc2VlbXMgdGhhdCB0aGUgdnBjdSBob3RwbHVnIHBhdGNoIHdhcyBv dmVyd3JpdGVkIGJ5IHRoZSB1cHN0cmVhbSBxZW11IHZlcnNpb24uDQoNCg0KDQoNCg0KaGVyYmVy dCBjbGFuZA== ------=_001_NextPart205340081584_=---- Content-Type: text/html; charset="GB2312" Content-Transfer-Encoding: quoted-printable

Dear ALL!

Following merge may be overwrite the "xen:= Fix=20 vcpu initialization" patch

--------------------

Merge remote branch 'origin/stable-1.6' in= to=20 xen-staging-master-9

--------------------

This made a conflict for xen-all.c.

So it seems that the vpcu hotplug patch wa= s=20 overwrited by the upstream qemu version.

herbert cland

------=_001_NextPart205340081584_=------ --===============0689713517071110766== 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 --===============0689713517071110766==--