linux-kernel - Re: Resolved merge conflicts in next-creds

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20080812093911.36bc21d3.sfr@canb.auug.org.au>
Date:	Tue, 12 Aug 2008 09:39:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven French <sfrench@...ibm.com>
Cc:	James Morris <jmorris@...ei.org>,
	"David S. Miller" <davem@...emloft.net>,
	David Howells <dhowells@...hat.com>,
	linux-kernel@...r.kernel.org
Subject: Re: Resolved merge conflicts in next-creds

Hi Steve,

On Mon, 11 Aug 2008 09:51:28 -0500 Steven French <sfrench@...ibm.com> wrote:
>
> These (cifs) changes should be in Linus's mainline now so should be easier 
> to merge your patch now.

Yeah, the conflicts were no longer in yesterday's linux-next merge.
Thanks.

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

Content of type "application/pgp-signature" skipped