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

[Xen-devel] linux-next: manual merge of the xen-tip tree with Linus' tree

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:


between commit:

  fc5fee86bdd3 ("x86/xen: build "Xen PV" APIC driver for domU as well")

from Linus' tree and commit:

  6e3012fba294 ("xen/PMU: Initialization code for Xen PMU")

from the xen-tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/xen/Makefile
index 4b6e29ac0968,071fab5c720e..000000000000
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@@ -13,7 -13,7 +13,7 @@@ CFLAGS_mmu.o                  := $(nostackp
  obj-y         := enlighten.o setup.o multicalls.o mmu.o irq.o \
                        time.o xen-asm.o xen-asm_$(BITS).o \
                        grant-table.o suspend.o platform-pci-unplug.o \
-                       p2m.o apic.o
 -                      p2m.o pmu.o
++                      p2m.o apic.o pmu.o
  obj-$(CONFIG_EVENT_TRACING) += trace.o

Xen-devel mailing list



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