From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: [PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1
Date: Tue, 2 Oct 2012 12:43:33 -0400
Message-ID: <20121002164333.GA28626@phenom.dumpdata.com>
References: <alpine.DEB.2.02.1210021737000.29232@kaball.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.02.1210021737000.29232@kaball.uk.xensource.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>, "JBeulich@suse.com" <JBeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

On Tue, Oct 02, 2012 at 05:45:17PM +0100, Stefano Stabellini wrote:
> This patch is actually a merge conflict resolution between Konrad's Xen
> tree and the following commit:
> 
> commit 9fa5780beea1274d498a224822397100022da7d4
> Author: Jan Beulich <JBeulich@suse.com>
> Date:   Tue Sep 18 12:23:02 2012 +0100
> 
>     USB EHCI/Xen: propagate controller reset information to hypervisor
> 
> 
> Compile dbgp.o only if CONFIG_USB_SUPPORT is defined.
> After all xen_dbgp_op relies on hcd_to_bus.
> 
> This patch should be applied on top of 
> 
> http://marc.info/?l=linux-kernel&m=134919011231980&w=2

OK. I have that in my tree (along with the other patch you posted)

so I think we are all set for this issue.