linux-next: manual merge of the sunxi tree with the imx-xms tree

linux-next: manual merge of the sunxi tree with the imx-xms tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]

Hi all,

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

  arch/arm64/configs/defconfig

between commits:

  0a64ef2d28d1 ("arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m")
  c6b1ccce88ae ("defconfig: arm64: enable i.MX8 SCU octop driver")

from the imx-xms tree and commit:

  296bcfa05640 ("arm64: defconfig: add allwinner sid support")

from the sunxi 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 fa5752a950eb,0dc34e0d4cbc..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -426,8 -420,8 +426,9 @@@ CONFIG_UNIPHIER_THERMAL=
  CONFIG_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
+ CONFIG_SUNXI_WATCHDOG=m
  CONFIG_IMX2_WDT=y
 +CONFIG_IMX_SC_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
  CONFIG_RENESAS_WDT=y
@@@ -757,8 -742,7 +758,9 @@@ CONFIG_PHY_TEGRA_XUSB=
  CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 +CONFIG_NVMEM_IMX_OCOTP=y
 +CONFIG_NVMEM_IMX_OCOTP_SCU=y
+ CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_UNIPHIER_EFUSE=y

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]