From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Linus Walleij <linus.walleij@linaro.org>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Tue, 2 Apr 2013 17:55:57 +1100 [thread overview]
Message-ID: <20130402175557.e44f384205d2d32dcd95be1d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/Kconfig.debug between commit 266c347924f5 ("ARM: nomadik: move
debugmacro to debug includes") from the arm-soc tree and commit
11c6f861cf3a ("ARM: mxs: rename debug-macro.S for multiplatform build")
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/Kconfig.debug
index d212ae0,057601e..0000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -611,10 -591,9 +611,11 @@@ config DEBUG_LL_INCLUD
DEBUG_IMX6Q_UART
default "debug/highbank.S" if DEBUG_HIGHBANK_UART
default "debug/mvebu.S" if DEBUG_MVEBU_UART
+ default "debug/nomadik.S" if DEBUG_NOMADIK_UART
+ default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
+ default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-02 6:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 6:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 0:43 linux-next: manual merge of the imx-mxs tree with the arm-soc tree Stephen Rothwell
2019-04-29 23:49 Stephen Rothwell
2018-03-26 22:10 Stephen Rothwell
2018-03-27 7:55 ` Shawn Guo
2018-03-27 7:59 ` Arnd Bergmann
2017-10-30 11:58 Mark Brown
2015-06-01 0:54 Stephen Rothwell
2015-05-21 0:58 Stephen Rothwell
2015-01-13 0:16 Stephen Rothwell
2015-01-13 13:18 ` Arnd Bergmann
2015-01-13 20:29 ` Stephen Rothwell
2014-03-03 1:58 Stephen Rothwell
2014-02-20 0:42 Stephen Rothwell
2014-02-20 1:30 ` Shawn Guo
2014-01-05 23:42 Stephen Rothwell
2014-01-05 23:38 Stephen Rothwell
2013-06-19 6:24 Stephen Rothwell
2013-06-03 5:41 Stephen Rothwell
2013-04-10 7:33 Stephen Rothwell
2013-04-02 6:57 Stephen Rothwell
2013-03-22 4:09 Stephen Rothwell
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=20130402175557.e44f384205d2d32dcd95be1d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=shawn.guo@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).