lkml.org 
[lkml]   [2008]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: 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]
    \
     
     \ /
      Last update: 2008-08-12 01:41    [W:0.094 / U:60.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site