From mboxrd@z Thu Jan  1 00:00:00 1970
From: soren.brinkmann@xilinx.com (=?utf-8?B?U8O2cmVu?= Brinkmann)
Date: Mon, 17 Mar 2014 09:41:18 -0700
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
In-Reply-To: <20140317163506.5770f06a77ba011e682f47ff@canb.auug.org.au>
References: <20140317163506.5770f06a77ba011e682f47ff@canb.auug.org.au>
Message-ID: <6b7bc052-bb06-4821-9710-50c4852425c8@AM1EHSMHS002.ehs.local>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Mon, 2014-03-17 at 04:35PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 ("ARM: centralize
> common multi-platform kconfig options") from the arm-soc tree and commit
> cd325295871f ("arm: zynq: Add support for cpufreq") from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
> 
> diff --cc arch/arm/mach-zynq/Kconfig
> index 105d39b72a25,f03e75bd0b2b..000000000000
> --- a/arch/arm/mach-zynq/Kconfig
> +++ b/arch/arm/mach-zynq/Kconfig
> @@@ -2,10 -2,19 +2,12 @@@ config ARCH_ZYN
>   	bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
>   	select ARM_AMBA
>   	select ARM_GIC
> + 	select ARCH_HAS_CPUFREQ
> + 	select ARCH_HAS_OPP
>  -	select COMMON_CLK
>  -	select CPU_V7
>  -	select GENERIC_CLOCKEVENTS
>   	select HAVE_ARM_SCU if SMP
>   	select HAVE_ARM_TWD if SMP
>   	select ICST
>  -	select MIGHT_HAVE_CACHE_L2X0

The two conflicting patches mentioned above don't touch this line, I
think. I'm not sure whether this should go away.
Apart from this, things look okay to me.

	Thanks,
	S?ren