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

[broonie@xxxxxxxxxx]

Hi all,

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

  fs/nfs/file.c

between commit:

  66dabbb65d673 ("mm: return an ERR_PTR from __filemap_get_folio")

from the mm-stable tree and commit:

  e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")

from the ext4 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 1d03406e6c039,2474cbc30712a..0000000000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -335,9 -326,10 +326,10 @@@ static int nfs_write_begin(struct file 
  		file, mapping->host->i_ino, len, (long long) pos);
  
  start:
- 	folio = nfs_folio_grab_cache_write_begin(mapping, pos >> PAGE_SHIFT);
+ 	folio = __filemap_get_folio(mapping, pos >> PAGE_SHIFT, FGP_WRITEBEGIN,
+ 				    mapping_gfp_mask(mapping));
 -	if (!folio)
 -		return -ENOMEM;
 +	if (IS_ERR(folio))
 +		return PTR_ERR(folio);
  	*pagep = &folio->page;
  
  	ret = nfs_flush_incompatible(file, folio);