linux-kernel - Re: linux-next: manual merge of the als tree with Linus' 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: <20100219144617.beac04cf.sfr@canb.auug.org.au>
Date:	Fri, 19 Feb 2010 14:46:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jonathan Cameron <jic23@....ac.uk>
Cc:	Zhang Rui <rui.zhang@...el.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alan Jenkins <alan-jenkins@...fmail.co.uk>
Subject: Re: linux-next: manual merge of the als tree with Linus' tree

Hi Jonathan,

On Thu, 18 Feb 2010 15:16:19 +0000 Jonathan Cameron <jic23@....ac.uk> wrote:
>
> I've reset that last patch, merged Linus' current tree and reapplied it on top with the
> merge problems fixed up.  While I was there I edited the commit message so it was actually
> English (oops).
> 
> Anyhow, (fingers crossed), it should now work fine.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped