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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121002141949.f6e61437bdce0d56d9d4321e@canb.auug.org.au>
Date:	Tue, 2 Oct 2012 14:19:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jan Beulich <JBeulich@...e.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Stefano Stabellini <stefano.stabellini@...citrix.com>
Subject: linux-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@...b.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

Content of type "application/pgp-signature" skipped