linux-kernel - [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1

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: <alpine.DEB.2.02.1210021606000.29232@kaball.uk.xensource.com>
Date:	Tue, 2 Oct 2012 16:13:15 +0100
From:	Stefano Stabellini <stefano.stabellini@...citrix.com>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
CC:	<xen-devel@...ts.xensource.com>, <linux-kernel@...r.kernel.org>,
	Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
	<sfr@...b.auug.org.au>, <JBeulich@...e.com>
Subject: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1

This patch is actually a merge conflict resolution between Konrad's Xen
tree and the following commit:

commit 9fa5780beea1274d498a224822397100022da7d4
Author: Jan Beulich <JBeulich@...e.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@...b.auug.org.au>
Signed-off-by: Stefano Stabellini <stefano.stabellini@...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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/