* linux-next: manual merge of the imx-mxs tree with the tree
@ 2014-06-15 23:59 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-06-15 23:59 UTC (permalink / raw)
To: Shawn Guo, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Stephen Boyd
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the imx-mxs tree with the tree
2014-01-05 23:49 Stephen Rothwell
@ 2014-01-06 0:06 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2014-01-06 0:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Shawn Guo, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Fabio Estevam, Troy Kisky
On Sun, Jan 5, 2014 at 3:49 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Shawn,
>
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM:
> imx: Explicitly pass the active level of the PHY reset") from the arm-soc
> tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual
> Lite/Solo support") from the imx-mxs tree.
>
> I fixed it up (just used the latter) and can carry the fix as necessary
> (no action is required).
Thanks Stephen. The offending patch from the arm-soc side has been
dropped, but I didn't push out the new for-next yet. It should be gone
tomorrow. Same for some of the other imx conflicts.
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the imx-mxs tree with the tree
@ 2014-01-05 23:49 Stephen Rothwell
2014-01-06 0:06 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2014-01-05 23:49 UTC (permalink / raw)
To: Shawn Guo, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Fabio Estevam, Troy Kisky
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM:
imx: Explicitly pass the active level of the PHY reset") from the arm-soc
tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual
Lite/Solo support") from the imx-mxs tree.
I fixed it up (just used the latter) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-15 23:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-15 23:59 linux-next: manual merge of the imx-mxs tree with the tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-01-05 23:49 Stephen Rothwell
2014-01-06 0:06 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).