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

[Christoph Hellwig]

Thanks Stephen,

the fix looks good.

Anna, given that the commit is near the head of your branch I can
resend (or you can just fix up directy) to use folio_pos instead of
folio_file_pos to avoid the harder to fix part of the conflict.