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>] [day] [month] [year] [list]

Message-Id: <20140121105854.77cebd3229f919ce6e7976b2@canb.auug.org.au>
Date:	Tue, 21 Jan 2014 10:58:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>,
	Russell King <rmk@....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 conflicts in
arch/arm/boot/dts/Makefile, arch/arm/boot/dts/imx6dl-hummingboard.dts,
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi and
arch/arm/boot/dts/imx6qdl-microsom.dtsi between commits 728d5599f5d8
("ARM: imx: initial SolidRun HummingBoard support") and d79c363fd9cd
("ARM: imx: initial SolidRun Cubox-i support") from the arm tree and a
series of commits from the imx-mxs tree.

Russell told me that the imx-ims tree changes have not yet been approved
for v3.13 inclusion and they conflict fairly badly, so for today I have
dropped the imx-mxs tree.  Let me know what I should do in the future.

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

Content of type "application/pgp-signature" skipped