From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Stephen Warren <swarren@nvidia•com>,
Colin Cross <ccross@android•com>, Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>,
Simon Horman <horms@verge•net.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas•com>,
Magnus Damm <damm+renesas@opensource•se>
Subject: linux-next: manual merge of the tegra tree with the renesas tree
Date: Wed, 18 Nov 2015 10:15:12 +1100 [thread overview]
Message-ID: <20151118101512.0691d12f@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")
from the renesas tree and commit:
0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")
from the tegra 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/arm64/configs/defconfig
index a260e3a46f01,3852c51330e2..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -118,9 -116,7 +118,10 @@@ CONFIG_SERIAL_SAMSUNG=
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=11
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ CONFIG_SERIAL_TEGRA=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
next reply other threads:[~2015-11-17 23:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 23:15 Stephen Rothwell [this message]
2015-11-18 14:22 ` linux-next: manual merge of the tegra tree with the renesas tree Thierry Reding
2015-11-18 16:04 ` Simon Horman
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=20151118101512.0691d12f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ccross@android$(echo .)com \
--cc=damm+renesas@opensource$(echo .)se \
--cc=horms@verge$(echo .)net.au \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=swarren@nvidia$(echo .)com \
--cc=treding@nvidia$(echo .)com \
/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