* [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
@ 2012-10-02 15:13 Stefano Stabellini
2012-10-02 15:21 ` Stephen Rothwell
2012-10-02 15:25 ` Jan Beulich
0 siblings, 2 replies; 4+ messages in thread
From: Stefano Stabellini @ 2012-10-02 15:13 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: xen-devel, linux-kernel, Stefano Stabellini, sfr, JBeulich
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.
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@canb.auug.org.au>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff --cc drivers/xen/Makefile
index a4a3cab,275abfc..33711ad
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -4,8 -8,11 +8,12 @@@ obj-y += xenbus
nostackp := $(call cc-option, -fno-stack-protector)
CFLAGS_features.o := $(nostackp)
+ dom0-$(CONFIG_PCI) += pci.o
+ dom0-$(CONFIG_ACPI) += acpi.o
+ dom0-$(CONFIG_X86) += pcpu.o
++dom0-$(CONFIG_USB) += dbgp.o
+ obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
obj-$(CONFIG_BLOCK) += biomerge.o
- obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
2012-10-02 15:13 [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1 Stefano Stabellini
@ 2012-10-02 15:21 ` Stephen Rothwell
2012-10-02 15:25 ` Jan Beulich
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-10-02 15:21 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Konrad Rzeszutek Wilk, xen-devel, linux-kernel,
Stefano Stabellini, JBeulich
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
Hi,
On Tue, 2 Oct 2012 16:13:15 +0100 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.
> 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@canb.auug.org.au>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
2012-10-02 15:13 [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1 Stefano Stabellini
2012-10-02 15:21 ` Stephen Rothwell
@ 2012-10-02 15:25 ` Jan Beulich
2012-10-02 15:30 ` Stefano Stabellini
1 sibling, 1 reply; 4+ messages in thread
From: Jan Beulich @ 2012-10-02 15:25 UTC (permalink / raw)
To: Stefano Stabellini, Konrad Rzeszutek Wilk; +Cc: sfr, xen-devel, linux-kernel
>>> 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).
Jan
> 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@canb.auug.org.au>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>
> diff --cc drivers/xen/Makefile
> index a4a3cab,275abfc..33711ad
> --- a/drivers/xen/Makefile
> +++ b/drivers/xen/Makefile
> @@@ -4,8 -8,11 +8,12 @@@ obj-y += xenbus
> nostackp := $(call cc-option, -fno-stack-protector)
> CFLAGS_features.o := $(nostackp)
>
> + dom0-$(CONFIG_PCI) += pci.o
> + dom0-$(CONFIG_ACPI) += acpi.o
> + dom0-$(CONFIG_X86) += pcpu.o
> ++dom0-$(CONFIG_USB) += dbgp.o
> + obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
> obj-$(CONFIG_BLOCK) += biomerge.o
> - obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
> obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
> obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
> obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
2012-10-02 15:25 ` Jan Beulich
@ 2012-10-02 15:30 ` Stefano Stabellini
0 siblings, 0 replies; 4+ messages in thread
From: Stefano Stabellini @ 2012-10-02 15:30 UTC (permalink / raw)
To: Jan Beulich
Cc: Stefano Stabellini, Konrad Rzeszutek Wilk, sfr, xen-devel, linux-kernel
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-02 15:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-02 15:13 [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1 Stefano Stabellini
2012-10-02 15:21 ` Stephen Rothwell
2012-10-02 15:25 ` Jan Beulich
2012-10-02 15:30 ` Stefano Stabellini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®