Re: linux-next: manual merge of the mm-stable tree with the cifs tree

[Stephen Rothwell]

Hi David,

On Wed, 22 Feb 2023 08:27:50 +0000 David Howells <dhowells@xxxxxxxxxx> wrote:
>
> 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!

Thanks for checking.

-- 
Cheers,
Stephen Rothwell

Attachment: pgphbwErrzZrd.pgp
Description: OpenPGP digital signature