linux-kernel - Re: linux-next: manual merge of the tip tree with the arm-soc 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: <6b7bc052-bb06-4821-9710-50c4852425c8@AM1EHSMHS002.ehs.local>
Date:	Mon, 17 Mar 2014 09:41:18 -0700
From:	Sören Brinkmann <soren.brinkmann@...inx.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Rob Herring <robh@...nel.org>,
	Daniel Lezcano <daniel.lezcano@...aro.org>
Subject: Re: linux-next: manual merge of the tip tree with the arm-soc tree

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@...b.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


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