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>,
Shawn Guo <shawn.guo@linaro•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Abel Vesa <abel.vesa@nxp•com>
Subject: linux-next: manual merge of the tegra tree with the imx-mxs tree
Date: Thu, 7 Feb 2019 09:51:42 +1100 [thread overview]
Message-ID: <20190207095142.5ccc4a8a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
9bd01e74c715 ("arm64: defconfig: Add i.MX8MQ boot necessary configs")
from the imx-mxs tree and commit:
bc72bed682a9 ("arm64: defconfig: Enable Tegra TCU")
from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index e82bc8cf1253,ad8f3dea0a74..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE=
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
+ CONFIG_SERIAL_TEGRA_TCU=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-06 22:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 22:51 Stephen Rothwell [this message]
2019-02-07 8:49 ` linux-next: manual merge of the tegra tree with the imx-mxs tree Thierry Reding
2019-02-07 9:01 ` Abel Vesa
-- strict thread matches above, loose matches on Subject: below --
2019-02-11 22:01 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=20190207095142.5ccc4a8a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abel.vesa@nxp$(echo .)com \
--cc=ccross@android$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=shawn.guo@linaro$(echo .)org \
--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