This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tr

To: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 3 Aug 2010 14:13:51 +1000
Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>, Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, Konrad, Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Delivery-date: Mon, 02 Aug 2010 21:14:48 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Hi all,

Today's linux-next merge of the xen tree got a conflict in
drivers/xen/Kconfig drivers/xen/Makefile between commit
b097186fd29d5bc5a26d1ae87995821ffc27b66e ("swiotlb-xen: SWIOTLB library
for Xen PV guest with PCI passthrough") from the swiotlb tree and commit
183d03cc4ff39e0f0d952c09aa96d0abfd6e0c3c ("xen: Xen PCI platform device
driver") from the xen tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/xen/Kconfig
index 97199c2,0a88269..0000000
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -62,8 -62,13 +62,18 @@@ config XEN_SYS_HYPERVISO
         virtual environment, /sys/hypervisor will still be present,
         but will have no xen contents.
 +config SWIOTLB_XEN
 +      def_bool y
 +      depends on SWIOTLB
+       tristate "xen platform pci device driver"
+       depends on XEN_PVHVM
+       default m
+       help
+         Driver for the Xen PCI Platform device: it is responsible for
+         initializing xenbus and grant_table when running in a Xen HVM
+         domain. As a consequence this driver is required to run any Xen PV
+         frontend on Xen HVM.
diff --cc drivers/xen/Makefile
index 85f84cf,e392fb7..0000000
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -10,4 -10,4 +10,5 @@@ obj-$(CONFIG_XEN_BALLOON)     += balloon.
  obj-$(CONFIG_XEN_DEV_EVTCHN)  += evtchn.o
  obj-$(CONFIG_XENFS)           += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
 +obj-$(CONFIG_SWIOTLB_XEN)     += swiotlb-xen.o
+ obj-$(CONFIG_XEN_PLATFORM_PCI)        += platform-pci.o

Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>