On Tue, Aug 03, 2010 at 02:13:51PM +1000, Stephen Rothwell wrote:
> 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.
Thank you!
> --
> Cheers,
> 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
> +
> + config XEN_PLATFORM_PCI
> + 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.
> ++
> endmenu
> 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
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
