linux-next: manual merge of the rockchip tree with the amlogic tree

[Stephen Rothwell]

Hi all,

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

  arch/arm/configs/multi_v7_defconfig

between commit:

  029da5e5266c ("ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers")

from the amlogic tree and commit:

  366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")

from the rockchip 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/multi_v7_defconfig
index 1fd4b8fcce2e,d160ac4bad21..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -984,7 -989,7 +994,8 @@@ CONFIG_PHY_UNIPHIER_USB2=
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_TWL4030_USB=m
 +CONFIG_MESON_MX_EFUSE=m
+ CONFIG_ROCKCHIP_EFUSE=m
  CONFIG_NVMEM_IMX_OCOTP=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_NVMEM_VF610_OCOTP=y

Attachment: pgp0tAUyGnkUE.pgp
Description: OpenPGP digital signature