linux-kernel - Re: linux-next: manual merge of the scsi-post-merge tree with the akpm 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: <20110829155431.5b45eb39b10481731115b3b5@canb.auug.org.au>
Date:	Mon, 29 Aug 2011 15:54:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sergei Trofimovich <slyfox@...too.org>
Subject: Re: linux-next: manual merge of the scsi-post-merge tree with the
 akpm tree

Hi Andrew,

This was, of course a conflict between the akpm tree and Linus' tree ...

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

Content of type "application/pgp-signature" skipped