* linux-next: manual merge of the mvebu tree with the imx-mxs tree
@ 2013-06-06 5:36 Stephen Rothwell
2013-06-06 11:08 ` Jason Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-06-06 5:36 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Shawn Guo, Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/Kconfig.debug between commit 284166ffebc3 ("ARM: imx: enable
low-level debug support for imx6sl") from the imx-mxs tree and commit
5be22d8c29fd ("arm: mvebu: add another earlyprintk Kconfig option") from
the mvebu 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/Kconfig.debug
index 29f7623,e6a6ab1..0000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -639,9 -656,9 +664,10 @@@ config DEBUG_LL_INCLUD
DEBUG_IMX35_UART || \
DEBUG_IMX51_UART || \
DEBUG_IMX53_UART ||\
- DEBUG_IMX6Q_UART
+ DEBUG_IMX6Q_UART || \
+ DEBUG_IMX6SL_UART
- default "debug/mvebu.S" if DEBUG_MVEBU_UART
+ default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
+ DEBUG_MVEBU_UART_ALTERNATE
default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
default "debug/nomadik.S" if DEBUG_NOMADIK_UART
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the mvebu tree with the imx-mxs tree
2013-06-06 5:36 linux-next: manual merge of the mvebu tree with the imx-mxs tree Stephen Rothwell
@ 2013-06-06 11:08 ` Jason Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Jason Cooper @ 2013-06-06 11:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: andrew, gregory.clement, linux-arm-kernel, linux-next,
linux-kernel, Shawn Guo, Thomas Petazzoni
On Thu, Jun 06, 2013 at 03:36:00PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/Kconfig.debug between commit 284166ffebc3 ("ARM: imx: enable
> low-level debug support for imx6sl") from the imx-mxs tree and commit
> 5be22d8c29fd ("arm: mvebu: add another earlyprintk Kconfig option") from
> the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks Stephen!
thx,
Jason.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig.debug
> index 29f7623,e6a6ab1..0000000
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@@ -639,9 -656,9 +664,10 @@@ config DEBUG_LL_INCLUD
> DEBUG_IMX35_UART || \
> DEBUG_IMX51_UART || \
> DEBUG_IMX53_UART ||\
> - DEBUG_IMX6Q_UART
> + DEBUG_IMX6Q_UART || \
> + DEBUG_IMX6SL_UART
> - default "debug/mvebu.S" if DEBUG_MVEBU_UART
> + default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
> + DEBUG_MVEBU_UART_ALTERNATE
> default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
> default "debug/nomadik.S" if DEBUG_NOMADIK_UART
> default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-06 11:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-06 5:36 linux-next: manual merge of the mvebu tree with the imx-mxs tree Stephen Rothwell
2013-06-06 11:08 ` Jason Cooper
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).