linux-kernel - linux-next: manual merge of the imx-mxs tree with the 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>] [day] [month] [year] [list]

Message-ID: <20140616095928.1f21f8af@canb.auug.org.au>
Date:	Mon, 16 Jun 2014 09:59:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>, Olof Johansson <olof@...om.net>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephen Boyd <sboyd@...eaurora.org>
Subject: linux-next: manual merge of the imx-mxs tree with the  tree

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/Kconfig between commit e49d9b375628 ("ARM: Remove
ARCH_HAS_CPUFREQ config option") from the arm-soc tree and commit
7de46855b1e7 ("ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree
only'") from the imx-mxs 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-imx/Kconfig
index 28fa2fa49e5d,3b2a5c58cf91..000000000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -700,9 -691,15 +688,14 @@@ if ARCH_MULTI_V
  
  comment "Device tree only"
  
+ config SOC_IMX5
+ 	bool
 -	select ARCH_HAS_CPUFREQ
+ 	select ARCH_HAS_OPP
+ 	select HAVE_IMX_SRC
+ 	select MXC_TZIC
+ 
  config	SOC_IMX50
  	bool "i.MX50 support"
- 	select HAVE_IMX_SRC
  	select PINCTRL_IMX50
  	select SOC_IMX5
  

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)