lkml.org 
[lkml]   [2023]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: linux-next: manual merge of the mm-stable tree with the cifs tree
    Date
    Stephen Rothwell <sfr@canb.auug.org.au> wrote:

    > OK, so in the merge of mm-stable, I used the cifs version of
    > fs/cifs/file.c with this patch applied. The merge resolution for that
    > file looks like this:

    I checked it out and diffed it against mine. Looks right, thanks!

    David

    \
     
     \ /
      Last update: 2023-03-27 00:32    [W:4.121 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site