[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


On Tue, 2 Oct 2012 16:13:15 +0100 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.
> 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
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

I'll use this resolution if it is needed tomorrow.  Assuming that the
other build problem with the xen-two tree is fixed, of course.

Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpKMBK5tzmG4.pgp
Description: PGP signature

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.