From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shawn Guo <shawn.guo@linaro•org>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stephen Boyd <sboyd@codeaurora•org>
Subject: linux-next: manual merge of the imx-mxs tree with the tree
Date: Mon, 16 Jun 2014 09:59:28 +1000 [thread overview]
Message-ID: <20140616095928.1f21f8af@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 967 bytes --]
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@canb•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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-06-15 23:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-15 23:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-01-05 23:49 linux-next: manual merge of the imx-mxs tree with the tree Stephen Rothwell
2014-01-06 0:06 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140616095928.1f21f8af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sboyd@codeaurora$(echo .)org \
--cc=shawn.guo@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox