linux-next: manual merge of the samsung-krzk tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/arm/configs/multi_v7_defconfig

between commit:

  a304c0a60252 ("arm64/ARM: configs: Change CONFIG_REMOTEPROC from m to y")

from Linus' tree and commit:

  00265bee1002 ("ARM: multi_v7_defconfig: Enable options for boards with Exynos SoC")

from the samsung-krzk 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 e4c8def9a0a5,9711c61bd76e..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -933,7 -943,8 +943,8 @@@ CONFIG_BCM2835_MBOX=
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
+ CONFIG_EXYNOS_IOMMU=y
 -CONFIG_REMOTEPROC=m
 +CONFIG_REMOTEPROC=y
  CONFIG_ST_REMOTEPROC=m
  CONFIG_RPMSG_VIRTIO=m
  CONFIG_ASPEED_LPC_CTRL=m

Attachment: pgpFtkVsmyTSq.pgp
Description: OpenPGP digital signature