linux-kernel - Re: linux-next: manual merge of the crypto tree with the tegra 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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 23 Jan 2012 16:05:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>
Cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Henning Heinold <heinold@....fu-berlin.de>,
	Varun Wadekar <vwadekar@...dia.com>,
	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>
Subject: Re: linux-next: manual merge of the crypto tree with the tegra tree

Hi Olof,

On Sun, 22 Jan 2012 20:24:16 -0800 Olof Johansson <olof@...om.net> wrote:
>
> I should cherry-pick in the same change as Herbert is carrying, and do
> the rest of the fuse changes on top of that. I'll do that for
> tomorrows -next.

Only if its going to get much worse or you need the change.  The conflict
is trivial ...

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

Content of type "application/pgp-signature" skipped