linux-kernel - linux-next: manual merge of the imx-mxs tree with the 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]

Message-Id: <20140106104938.82a53f6d3b4d773607fe7556@canb.auug.org.au>
Date:	Mon, 6 Jan 2014 10:49:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>, Olof Johansson <olof@...om.net>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Troy Kisky <troy.kisky@...ndarydevices.com>
Subject: linux-next: manual merge of the imx-mxs tree with the  tree

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM:
imx: Explicitly pass the active level of the PHY reset") from the arm-soc
tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual
Lite/Solo support") from the imx-mxs tree.

I fixed it up (just used the latter) and can carry the fix as necessary
(no action is required).

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

Content of type "application/pgp-signature" skipped