Re: [Xen-devel] [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Tue, 2 Oct 2012, Jan Beulich wrote:
> >>> On 02.10.12 at 17:13, Stefano Stabellini 
> >>> <stefano.stabellini@xxxxxxxxxxxxx> wrote:
> > This patch is actually a merge conflict resolution between Konrad's Xen
> > tree and the following commit:
> > 
> > commit 9fa5780beea1274d498a224822397100022da7d4
> > Author: Jan Beulich <JBeulich@xxxxxxxx>
> > 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 is defined.
> 
> Now this is wrong: USB is a tristate config option, yet dbgp.o
> must be built in. This is why I suggested to use USB_SUPPORT
> (if anything at all).

I see. You are right. I'll re-send the patch.

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