Hi all,

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

  fs/ntfs3/file.c

between commit:

  77a150da4e780 ("mm: update all remaining mmap_prepare users to use vma_flags_t")

from the mm-unstable tree and commit:

  9d5403b1036cd ("fs: convert most other generic_file_*mmap() users to .mmap_prepare()")
  099ef9ab9203d (fs/ntfs3: implement iomap-based file operations)

from the fs-next 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/ntfs3/file.c
index 2902fc6d9a85d,571ee85e82594..0000000000000
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@@ -346,8 -246,7 +246,7 @@@ static int ntfs_file_mmap_prepare(struc
  	struct file *file = desc->file;
  	struct inode *inode = file_inode(file);
  	struct ntfs_inode *ni = ntfs_i(inode);
- 	u64 from = ((u64)desc->pgoff << PAGE_SHIFT);
 -	bool rw = desc->vm_flags & VM_WRITE;
 +	const bool rw = vma_desc_test_flags(desc, VMA_WRITE_BIT);
  	int err;
  
  	/* Avoid any operation if inode is bad. */