Subject: Re: linux-next: manual merge of the xen-two tree with Linus' tree

From: Stefano Stabellini <[email-masked]>
Date: Tue, 2 Oct 2012 11:44:14 +0100

On Tue, 2 Oct 2012, Stephen Rothwell wrote:
> Hi Konrad,
> 
> Today's linux-next merge of the xen-two tree got a conflict in
> drivers/xen/Makefile between commit 9fa5780beea1 ("USB EHCI/Xen:
> propagate controller reset information to hypervisor") from Linus' tree
> and commit 13febc84849d ("xen: do not compile manage, balloon, pci, acpi,
> pcpu and cpu_hotplug on ARM") from the xen-two tree.
> 
> I fixed it up (I am not sure exactly what it should depend on - see
> below) and can carry the fix as necessary (no action is required).
>
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> 
> diff --cc drivers/xen/Makefile
> index a4a3cab,cd28aae..0000000
> --- 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)
>   
> + obj-$(CONFIG_XEN_DOM0)			+= $(dom0-y)
> + dom0-$(CONFIG_PCI) += pci.o
> ++dom0-$(CONFIG_X86) += dbgp.o
> + dom0-$(CONFIG_ACPI) += acpi.o
> + dom0-$(CONFIG_X86) += pcpu.o
>   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

Considering that dbgp doesn't seem to be very useful without PCI at the
moment, could we just turn it into:

dom0-$(CONFIG_PCI) += dbgp.o

?