Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
