Re: Resolved merge conflicts in next-creds

[Stephen Rothwell]

Hi Steve,

On Mon, 11 Aug 2008 09:51:28 -0500 Steven French <sfrench@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature