linux-kernel - Re: linux-next: manual merge of the xen-tip tree with the arm64-acpi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.02.1503261834490.7982@kaball.uk.xensource.com>
Date:	Thu, 26 Mar 2015 18:35:13 +0000
From:	Stefano Stabellini <stefano.stabellini@...citrix.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jeremy Fitzhardinge <jeremy@...p.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Stefano Stabellini <stefano.stabellini@...citrix.com>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	Will Deacon <will.deacon@....com>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Hanjun Guo <hanjun.guo@...aro.org>,
	David Vrabel <david.vrabel@...rix.com>
Subject: Re: linux-next: manual merge of the xen-tip tree with the arm64-acpi
 tree

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@...b.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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/