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

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

[Mark Brown]

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

Hi all,

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

  arch/arm/boot/dts/nxp/vf/Makefile

between commit:

  2e1031df3c5f6 ("ARM: imx: remove nommu support")

from the arm-soc tree and commit:

  c90f5f176da7f ("ARM: dts: vf: add Iris carrier board support for Colibri VF50 and VF61")

from the imx-mxs 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.

diff --cc arch/arm/boot/dts/nxp/vf/Makefile
index 1733506c0c725,47be8bc318e28..0000000000000
--- a/arch/arm/boot/dts/nxp/vf/Makefile
+++ b/arch/arm/boot/dts/nxp/vf/Makefile
@@@ -1,9 -1,13 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_SOC_VF610) += \
  	vf500-colibri-eval-v3.dtb \
+ 	vf500-colibri-iris.dtb \
  	vf610-bk4.dtb \
  	vf610-colibri-eval-v3.dtb \
+ 	vf610-colibri-iris.dtb \
 -	vf610m4-colibri.dtb \
  	vf610-cosmic.dtb \
 -	vf610m4-cosmic.dtb \
  	vf610-twr.dtb \
  	vf610-zii-cfu1.dtb \
  	vf610-zii-dev-rev-b.dtb \

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