* linux-next: manual merge of the swiotlb-xen tree with the pci tree
@ 2010-10-20 3:09 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-10-20 3:09 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: linux-next, linux-kernel, matt mooney, Jesse Barnes, Ryan Wilson
Hi Konrad,
Today's linux-next merge of the swiotlb-xen tree got a conflict in
drivers/pci/Makefile between commit
350a55e9ff6005032407d3234af800f413b03af5 ("PCI: use new ccflags variable
in Makefile") from the pci tree and commit
956a9202cd1220397933a07beda9f96b3df1fa24 ("xen-pcifront: Xen PCI frontend
driver") from the swiotlb-xen tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
As I said in my other email, Konrad, you can ignore this report - it is
just for information. The conflict resolution is simple.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pci/Makefile
index dcd7ace,d5e2705..0000000
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -65,4 -65,8 +65,6 @@@ obj-$(CONFIG_PCI_SYSCALL) += syscall.
obj-$(CONFIG_PCI_STUB) += pci-stub.o
+ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+
-ifeq ($(CONFIG_PCI_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-10-20 3:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-20 3:09 linux-next: manual merge of the swiotlb-xen tree with the pci tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).