From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753170AbbCZSgd (ORCPT <rfc822;w@1wt.eu>);
	Thu, 26 Mar 2015 14:36:33 -0400
Received: from smtp02.citrix.com ([66.165.176.63]:62231 "EHLO
	SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752684AbbCZSg3 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 26 Mar 2015 14:36:29 -0400
X-IronPort-AV: E=Sophos;i="5.11,474,1422921600"; 
   d="scan'208";a="248721711"
Date: Thu, 26 Mar 2015 18:35:13 +0000
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
X-X-Sender: sstabellini@kaball.uk.xensource.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
In-Reply-To: <20150326173127.27fc5f42@canb.auug.org.au>
Message-ID: <alpine.DEB.2.02.1503261834490.7982@kaball.uk.xensource.com>
References: <20150326173127.27fc5f42@canb.auug.org.au>
User-Agent: Alpine 2.02 (DEB 1266 2009-07-14)
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
X-DLP: MIA2
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
>