Subject: linux-next: manual merge of the tegra tree with the imx-mxs tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Feb 2019 09:01:29 +1100

Hi all,

Today's linux-next merge of the tegra tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  28cfe2434529 ("arm64: defconfig: Enable PFUZE100 regulator")

from the imx-mxs tree and commit:

  2b5d2c92c29d ("arm64: defconfig: Enable MAX8973 regulator")

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 3317d85fa8a3,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
@@@ -451,7 -438,7 +452,8 @@@ CONFIG_REGULATOR_GPIO=
  CONFIG_REGULATOR_HI6421V530=y
  CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_MAX77620=y
+ CONFIG_REGULATOR_MAX8973=y
 +CONFIG_REGULATOR_PFUZE100=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_QCOM_RPMH=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y