| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] linux-next: manual merge of the swiotlb-xen tree with the xe
|
To: |
Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> |
|
Subject: |
[Xen-devel] linux-next: manual merge of the swiotlb-xen tree with the xen tree |
|
From: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Date: |
Mon, 13 Dec 2010 14:26:09 +1100 |
|
Cc: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Ian Campbell <ian.campbell@xxxxxxxxxx>, Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, Gerd Hoffmann <kraxel@xxxxxxxxxx> |
|
Delivery-date: |
Sun, 12 Dec 2010 19:27:02 -0800 |
|
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 Konrad,
Today's linux-next merge of the swiotlb-xen tree got a conflict in
drivers/xen/Kconfig drivers/xen/Makefile between commit
56385560d6d8fd4c89c4f328d3ff0ecc9c44c52d ("xen/gntdev: allow usermode to
map granted pages") from the xen tree and commits
06acb015d341946c83ab127f5ab9ba291678d226 ("xen: separate out frontend
xenbus") and 721657d92623cfcf2f6f68c14abf97eb40fa6b20 ("xen-pciback:
Enable Xen-PCI-back to be compiled") from the swiotlb-xen tree.
I fixed then up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/xen/Kconfig
index 0c6d2a1,9b61561..0000000
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -62,13 -134,9 +134,16 @@@ config XEN_SYS_HYPERVISO
virtual environment, /sys/hypervisor will still be present,
but will have no xen contents.
+config XEN_GNTDEV
+ tristate "userspace grant access device driver"
+ depends on XEN
+ select MMU_NOTIFIER
+ help
+ Allows userspace processes use grants.
+
+ config XEN_XENBUS_FRONTEND
+ tristate
+
config XEN_PLATFORM_PCI
tristate "xen platform pci device driver"
depends on XEN_PVHVM
diff --cc drivers/xen/Makefile
index 674fdb5,b813d46..0000000
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -9,7 -9,7 +9,8 @@@ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplu
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += balloon.o
obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o
+obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o
+ obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/
obj-$(CONFIG_XENFS) += xenfs/
obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
obj-$(CONFIG_XEN_PLATFORM_PCI) += platform-pci.o
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
| <Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-devel] linux-next: manual merge of the swiotlb-xen tree with the xen tree,
Stephen Rothwell <=
|
|
|
| |
|
Home