lkml.org 
[lkml]   [2012]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the xen-two tree with Linus' tree
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 sfr@canb.auug.org.au

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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-10-02 07:01    [W:0.054 / U:0.580 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site