linux-next: manual merge of the mm tree with the folio tree

[Stephen Rothwell]

Hi all,

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

  fs/nfs/file.c

between commit:

  9ac3e82e9ae2 ("nfs: Convert to release_folio")

from the folio tree and commit:

  e1736b007c43 ("VFS: Add FMODE_CAN_ODIRECT file flag")

from the mm 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 d764b3ce7905,bfb4b707b07e..000000000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -522,8 -537,7 +534,7 @@@ const struct address_space_operations n
  	.write_begin = nfs_write_begin,
  	.write_end = nfs_write_end,
  	.invalidate_folio = nfs_invalidate_folio,
 -	.releasepage = nfs_release_page,
 +	.release_folio = nfs_release_folio,
- 	.direct_IO = nfs_direct_IO,
  #ifdef CONFIG_MIGRATION
  	.migratepage = nfs_migrate_page,
  #endif

Attachment: pgpKzzFaL2K3K.pgp
Description: OpenPGP digital signature