[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

  • To: xen-devel <xen-devel@xxxxxxxxxxxxx>
  • From: "herbert cland" <herbert.cland@xxxxxxxxx>
  • Date: Wed, 12 Feb 2014 17:14:50 +0800
  • Delivery-date: Wed, 12 Feb 2014 09:15:07 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xen.org>

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



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.