Hi all,

Today's linux-next merge of the folio tree got a conflict in:

  fs/nfs/file.c

between commit:

  8786fde8421c ("Convert NFS from readpages to readahead")

from the nfs tree and commit:

  821405cf3ebb ("fs: Convert trivial uses of __set_page_dirty_nobuffers to filemap_dirty_folio")

from the folio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/nfs/file.c
index 81c80548a5c6,2df2a5392737..000000000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -518,8 -514,8 +518,8 @@@ static void nfs_swap_deactivate(struct 
  
  const struct address_space_operations nfs_file_aops = {
  	.readpage = nfs_readpage,
 -	.readpages = nfs_readpages,
 +	.readahead = nfs_readahead,
- 	.set_page_dirty = __set_page_dirty_nobuffers,
+ 	.dirty_folio = filemap_dirty_folio,
  	.writepage = nfs_writepage,
  	.writepages = nfs_writepages,
  	.write_begin = nfs_write_begin,

Hi all,

On Tue, 15 Mar 2022 20:45:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the folio tree got a conflict in:
> 
>   fs/nfs/file.c
> 
> between commit:
> 
>   8786fde8421c ("Convert NFS from readpages to readahead")
> 
> from the nfs tree and commit:
> 
>   821405cf3ebb ("fs: Convert trivial uses of __set_page_dirty_nobuffers to filemap_dirty_folio")
> 
> from the folio tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> 
> diff --cc fs/nfs/file.c
> index 81c80548a5c6,2df2a5392737..000000000000
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@@ -518,8 -514,8 +518,8 @@@ static void nfs_swap_deactivate(struct 
>   
>   const struct address_space_operations nfs_file_aops = {
>   	.readpage = nfs_readpage,
>  -	.readpages = nfs_readpages,
>  +	.readahead = nfs_readahead,
> - 	.set_page_dirty = __set_page_dirty_nobuffers,
> + 	.dirty_folio = filemap_dirty_folio,
>   	.writepage = nfs_writepage,
>   	.writepages = nfs_writepages,
>   	.write_begin = nfs_write_begin,

This is now a conflict between the nfs tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell