From mboxrd@z Thu Jan  1 00:00:00 1970
From: Anthony PERARD <anthony.perard@citrix.com>
Subject: Re: [qemu-upstream-unstable.git] is in CONFLICT state
Date: Mon, 17 Feb 2014 15:31:00 +0000
Message-ID: <20140217153100.GA26280@perard.uk.xensource.com>
References: <2014021217255231643849@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <2014021217255231643849@gmail.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: herbert cland <herbert.cland@gmail.com>
Cc: xen-devel <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

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