[Xen-devel] [qemu-upstream-unstable.git] is in CONFLICT state

["herbert cland" <herbert.cland@xxxxxxxxx>]

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

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel