Messages in this thread | | | Date | Tue, 2 Oct 2012 12:43:33 -0400 | From | Konrad Rzeszutek Wilk <> | Subject | Re: [PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1 |
| |
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.
| |