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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 29 Jan 2014 11:35:14 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>,
	Russell King <linux@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the imx-mxs tree with the arm tree

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
initial SolidRun Cubox-i support") from the arm tree and various commits
from the imx-mxs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/boot/dts/Makefile
index b9d6a8b485e0,2841184f354c..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -150,15 -137,32 +153,35 @@@ dtb-$(CONFIG_ARCH_MXC) += 
  	imx53-m53evk.dtb \
  	imx53-mba53.dtb \
  	imx53-qsb.dtb \
+ 	imx53-qsrb.dtb \
  	imx53-smd.dtb \
+ 	imx53-tx53-x03x.dtb \
+ 	imx53-tx53-x13x.dtb \
+ 	imx53-voipac-bsb.dtb \
 +	imx6dl-cubox-i.dtb \
+ 	imx6dl-dfi-fs700-m60.dtb \
+ 	imx6dl-gw51xx.dtb \
+ 	imx6dl-gw52xx.dtb \
+ 	imx6dl-gw53xx.dtb \
+ 	imx6dl-gw54xx.dtb \
 +	imx6dl-hummingboard.dtb \
+ 	imx6dl-nitrogen6x.dtb \
  	imx6dl-sabreauto.dtb \
+ 	imx6dl-sabrelite.dtb \
  	imx6dl-sabresd.dtb \
  	imx6dl-wandboard.dtb \
  	imx6q-arm2.dtb \
+ 	imx6q-cm-fx6.dtb \
 +	imx6q-cubox-i.dtb \
+ 	imx6q-dfi-fs700-m60.dtb \
+ 	imx6q-dmo-edmqmx6.dtb \
+ 	imx6q-gk802.dtb \
+ 	imx6q-gw51xx.dtb \
+ 	imx6q-gw52xx.dtb \
+ 	imx6q-gw53xx.dtb \
+ 	imx6q-gw5400-a.dtb \
+ 	imx6q-gw54xx.dtb \
+ 	imx6q-nitrogen6x.dtb \
  	imx6q-phytec-pbab01.dtb \
  	imx6q-sabreauto.dtb \
  	imx6q-sabrelite.dtb \

Content of type "application/pgp-signature" skipped