Messages in this thread | | | Date | Tue, 2 Oct 2012 16:30:06 +0100 | From | Stefano Stabellini <> | Subject | Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1 |
| |
On Tue, 2 Oct 2012, Jan Beulich wrote: > >>> On 02.10.12 at 17:13, Stefano Stabellini <stefano.stabellini@eu.citrix.com> 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 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.
| |