linux-next: manual merge of the tegra tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  arch/arm/configs/tegra_defconfig

between commit:

  67c70aa86f8b ("arm/arm64: defconfig: Update configs to use the new CROS_EC options")

from the arm-soc tree and commit:

  3a3cb021b038 ("ARM: tegra_defconfig: Enable options useful for Nexus 7 and Acer A500")

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/arm/configs/tegra_defconfig
index 8688c715ccde,729069b6d34c..000000000000
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -145,10 -164,15 +164,15 @@@ CONFIG_CHARGER_SMB347=
  CONFIG_CHARGER_TPS65090=y
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
+ CONFIG_THERMAL=y
+ CONFIG_THERMAL_STATISTICS=y
+ CONFIG_CPU_THERMAL=y
  CONFIG_WATCHDOG=y
+ CONFIG_MAX77620_WATCHDOG=y
  CONFIG_TEGRA_WATCHDOG=y
  CONFIG_MFD_AS3722=y
 -CONFIG_MFD_CROS_EC=y
 +CONFIG_MFD_CROS_EC_DEV=y
+ CONFIG_MFD_MAX77620=y
  CONFIG_MFD_MAX8907=y
  CONFIG_MFD_STMPE=y
  CONFIG_MFD_PALMAS=y

Attachment: pgpYlXHOsgiA6.pgp
Description: OpenPGP digital signature