Messages in this thread | | | Date | Thu, 7 Feb 2019 09:51:42 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tegra tree with the imx-mxs tree |
| |
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 [unhandled content-type:application/pgp-signature] | |