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

[Stephen Rothwell]

Hi all,

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

  fs/nfs/write.c

between commit:

  0c493b5cf16e ("NFS: Convert buffered writes to use folios")

from the nfs-anna tree and commit:

  d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")

from the mm-stable 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/write.c
index b508c985eb14,9d6432cb3f44..f4cca8f00c0c
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@@ -688,15 -689,14 +688,14 @@@ int nfs_writepage(struct page *page, st
  	return ret;
  }
  
- static int nfs_writepages_callback(struct page *page,
+ static int nfs_writepages_callback(struct folio *folio,
 -		struct writeback_control *wbc, void *data)
 +				   struct writeback_control *wbc, void *data)
  {
- 	struct folio *folio = page_folio(page);
  	int ret;
  
 -	ret = nfs_do_writepage(&folio->page, wbc, data);
 +	ret = nfs_do_writepage(folio, wbc, data);
  	if (ret != AOP_WRITEPAGE_ACTIVATE)
- 		unlock_page(page);
+ 		folio_unlock(folio);
  	return ret;
  }

Attachment: pgpEvSIUjihRb.pgp
Description: OpenPGP digital signature