From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Xen Devel <Xen-devel@lists.xensource.com>,
Will Deacon <will.deacon@arm.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hanjun Guo <hanjun.guo@linaro.org>,
David Vrabel <david.vrabel@citrix.com>
Subject: Re: linux-next: manual merge of the xen-tip tree with the arm64-acpi tree
Date: Thu, 26 Mar 2015 18:35:13 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1503261834490.7982@kaball.uk.xensource.com> (raw)
In-Reply-To: <20150326173127.27fc5f42@canb.auug.org.au>
On Thu, 26 Mar 2015, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in
> drivers/xen/Kconfig between commit 94ccae47e02d ("XEN / ACPI: Make XEN
> ACPI depend on X86") from the arm64-acpi tree and commit 628c28eefd6f
> ("xen: unify foreign GFN map/unmap for auto-xlated physmap guests")
> from the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's all right, thank you.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/xen/Kconfig
> index a31cd29b68a8,afc39ca5cc4f..000000000000
> --- a/drivers/xen/Kconfig
> +++ b/drivers/xen/Kconfig
> @@@ -253,8 -253,10 +253,14 @@@ config XEN_EF
> def_bool y
> depends on X86_64 && EFI
>
> +config XEN_ACPI
> + def_bool y
> + depends on X86 && ACPI
> +
> + config XEN_AUTO_XLATE
> + def_bool y
> + depends on ARM || ARM64 || XEN_PVHVM
> + help
> + Support for auto-translated physmap guests.
> +
> endmenu
>
prev parent reply other threads:[~2015-03-26 18:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 6:31 linux-next: manual merge of the xen-tip tree with the arm64-acpi tree Stephen Rothwell
2015-03-26 18:35 ` Stefano Stabellini [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=alpine.DEB.2.02.1503261834490.7982@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Xen-devel@lists.xensource.com \
--cc=david.vrabel@citrix.com \
--cc=hanjun.guo@linaro.org \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.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).