linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Date:	Sun, 5 Jan 2014 16:06:10 -0800
From:	Olof Johansson <olof@...om.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Shawn Guo <shawn.guo@...aro.org>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Troy Kisky <troy.kisky@...ndarydevices.com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the tree

On Sun, Jan 5, 2014 at 3:49 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 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).

Thanks Stephen. The offending patch from the arm-soc side has been
dropped, but I didn't push out the new for-next yet. It should be gone
tomorrow. Same for some of the other imx conflicts.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/