linux-kernel - Re: linux-next: manual merge of the xen-two tree with the arm 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]

Date:	Tue, 2 Oct 2012 08:44:20 -0400
From:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the xen-two tree with the arm tree

On Tue, Oct 02, 2012 at 02:11:41PM +1000, Stephen Rothwell wrote:
> Hi Konrad,
> 
> Today's linux-next merge of the xen-two tree got a conflict in
> arch/arm/Kconfig between commit bd51e2f59558 ("ARM: 7506/1: allow for
> ATAGS to be configured out when DT support is selected") from the arm
> tree and commit eff8d6447d5f ("xen/arm: introduce CONFIG_XEN on ARM")
> from the xen-two tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thank you!
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc arch/arm/Kconfig
> index 7df4acc,3361466..0000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -1897,6 -1891,22 +1897,16 @@@ config CC_STACKPROTECTO
>   	  neutralized via a kernel panic.
>   	  This feature requires gcc version 4.2 or above.
>   
>  -config DEPRECATED_PARAM_STRUCT
>  -	bool "Provide old way to pass kernel parameters"
>  -	help
>  -	  This was deprecated in 2001 and announced to live on for 5 years.
>  -	  Some old boot loaders still use this way.
>  -
> + config XEN_DOM0
> + 	def_bool y
> + 	depends on XEN
> + 
> + config XEN
> + 	bool "Xen guest support on ARM (EXPERIMENTAL)"
> + 	depends on EXPERIMENTAL && ARM && OF
> + 	help
> + 	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
> + 
>   endmenu
>   
>   menu "Boot options"


--
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/