From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Xen Devel <Xen-devel@lists.xensource.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Konrad@rcsinet12.oracle.com, Sheng Yang <sheng@linux.intel.com>
Subject: Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
Date: Tue, 3 Aug 2010 09:49:47 -0400 [thread overview]
Message-ID: <20100803134947.GC4751@phenom.dumpdata.com> (raw)
In-Reply-To: <20100803141351.cd70beca.sfr@canb.auug.org.au>
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@canb.auug.org.au
>
> 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@lists.xensource.com
> http://lists.xensource.com/xen-devel
prev parent reply other threads:[~2010-08-03 13:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 4:13 linux-next: manual merge of the xen tree with the swiotlb tree Stephen Rothwell
2010-08-03 13:49 ` Konrad Rzeszutek Wilk [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100803134947.GC4751@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=Konrad@rcsinet12.oracle.com \
--cc=Xen-devel@lists.xensource.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sheng@linux.intel.com \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).