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

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]

Hi all,

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

  fs/fuse/dax.c

between commit:

  e0adb1736318a ("fuse: dax: do not set VM_MIXEDMAP")

from the mm tree and commit:

  c1f6e67c4fe74 ("fuse: mark DAX VMA page protections as decrypted")

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/fuse/dax.c
index a5994f1c637d9,32c88ef814340..0000000000000
--- a/fs/fuse/dax.c
+++ b/fs/fuse/dax.c
@@@ -826,7 -826,8 +826,8 @@@ int fuse_dax_mmap(struct file *file, st
  {
  	file_accessed(file);
  	vma->vm_ops = &fuse_dax_vm_ops;
 -	vm_flags_set(vma, VM_MIXEDMAP | VM_HUGEPAGE);
 +	vma_set_flags(vma, VMA_HUGEPAGE_BIT);
+ 	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
  	return 0;
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]