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

Message-ID: <20150114072952.0e0546d1@canb.auug.org.au>
Date:	Wed, 14 Jan 2015 07:29:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-arm-kernel@...ts.infradead.org,
	Shawn Guo <shawn.guo@...aro.org>,
	Olof Johansson <olof@...om.net>,
	Anson Huang <b20788@...escale.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Peter Robinson <pbrobinson@...il.com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm-soc
 tree

Hi Arnd,

On Tue, 13 Jan 2015 14:18:32 +0100 Arnd Bergmann <arnd@...db.de> wrote:
>
> There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused
> build errors for me. We should soon be able to merge the other branches into
> arm-soc to avoid the entire set of merge conflicts, until then please
> change your recorded resolution to avoid the build error.

Oops, sorry about that. Fixed.

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

Content of type "application/pgp-signature" skipped