Messages in this thread | | | Date | Tue, 12 Aug 2008 09:39:11 +1000 | From | Stephen Rothwell <> | Subject | Re: Resolved merge conflicts in next-creds |
| |
Hi Steve,
On Mon, 11 Aug 2008 09:51:28 -0500 Steven French <sfrench@us.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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |