From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Ivan T. Ivanov" <iivanov@mm-sol.com>,
Heiko Stuebner <heiko@sntech.de>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Mon, 26 May 2014 10:37:15 +1000 [thread overview]
Message-ID: <20140526103715.09c491e3@canb.auug.org.au> (raw)
In-Reply-To: <20140526101741.102768b2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2555 bytes --]
Hi all,
On Mon, 26 May 2014 10:17:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/Kconfig.debug between commit 7098cff2a3f4 ("ARM: debug: qcom:
> make UART address selection configuration option") from the arm-soc
> tree and commit 1899de289497 ("ARM: S3C24XX: use generic
> DEBUG_UART_PHY/_VIRT in debug macro") from the samsung 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 6ff3dc661fdd,4678870f8ee8..000000000000
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@@ -966,10 -1007,10 +1003,11 @@@ config DEBUG_LL_INCLUD
> DEBUG_IMX51_UART || \
> DEBUG_IMX53_UART ||\
> DEBUG_IMX6Q_UART || \
> - DEBUG_IMX6SL_UART
> - default "debug/msm.S" if DEBUG_MSM_UART
> + DEBUG_IMX6SL_UART || \
> + DEBUG_IMX6SX_UART
> + default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
> default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
> + default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
> default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
> default "debug/sti.S" if DEBUG_STI_UART
> default "debug/tegra.S" if DEBUG_TEGRA_UART
> @@@ -1057,8 -1102,7 +1101,8 @@@ config DEBUG_UART_PHY
> default 0xfffff700 if ARCH_IOP33X
> depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
> DEBUG_LL_UART_EFM32 || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
> ++ DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
I forgot the || at the end, sorry. I fixed this up.
> + DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
>
> config DEBUG_UART_VIRT
> hex "Virtual base address of debug UART"
> @@@ -1118,8 -1166,7 +1168,8 @@@
> default 0xff003000 if DEBUG_U300_UART
> default DEBUG_UART_PHYS if !MMU
> depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
> ++ DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
Same here.
> + DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
>
> config DEBUG_UART_8250_SHIFT
> int "Register offset shift for the 8250 debug UART"
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-05-26 0:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 0:17 linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-21 1:13 Stephen Rothwell
2014-07-17 2:06 Stephen Rothwell
2014-07-17 2:01 Stephen Rothwell
2014-07-17 1:54 Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2013-04-05 5:02 Stephen Rothwell
2013-04-05 6:49 ` Kukjin Kim
2013-02-13 7:39 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-01-18 3:28 Stephen Rothwell
2013-01-18 3:24 Stephen Rothwell
2013-01-18 3:21 Stephen Rothwell
2013-01-11 4:32 Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:59 ` Stephen Rothwell
2013-01-11 4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-09-24 10:52 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=20140526103715.09c491e3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=heiko@sntech.de \
--cc=iivanov@mm-sol.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/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).