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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  fs/f2fs/f2fs.h

between commit:

  ae13569d02d0f ("f2fs: convert the ->private flag helpers to folio-only")

from the mm tree and commit:

  493b9dc8b52ca ("f2fs: cache: use node cache")

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.

Incidentally some of those flags don't seem to have users...

diff --cc fs/coredump.c
index 4d03826dd2498,f33ece836b10b..0000000000000
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@@ -1608,10 -1846,12 +1846,12 @@@ static unsigned long vma_dump_size(stru
  	}
  
  	/* Hugetlb memory check */
 -	if (is_vm_hugetlb_page(vma)) {
 +	if (vma_is_hugetlb(vma)) {
- 		if ((vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_SHARED))
+ 		if ((vma->vm_flags & VM_SHARED) &&
+ 		    COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, HUGETLB_SHARED))
  			goto whole;
- 		if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE))
+ 		if (!(vma->vm_flags & VM_SHARED) &&
+ 		    COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, HUGETLB_PRIVATE))
  			goto whole;
  		return 0;
  	}
diff --cc fs/f2fs/f2fs.h
index 85937de3d7016,c1f1e339f0857..0000000000000
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@@ -1614,23 -1612,21 +1609,21 @@@ static inline void f2fs_clear_bit(unsig
   *
   * Layout A: lowest bit should be 1
   * | bit0 = 1 | bit1 | bit2 | ... | bit MAX | private data .... |
 - * bit 0	PAGE_PRIVATE_NOT_POINTER
 - * bit 1	PAGE_PRIVATE_ONGOING_MIGRATION
 - * bit 2	PAGE_PRIVATE_REF_RESOURCE
 - * bit 3	PAGE_PRIVATE_ATOMIC_WRITE
 + * bit 0	F2FS_FOLIO_PRIVATE_NOT_POINTER
 + * bit 1	F2FS_FOLIO_PRIVATE_ONGOING_MIGRATION
-  * bit 2	F2FS_FOLIO_PRIVATE_INLINE_INODE
-  * bit 3	F2FS_FOLIO_PRIVATE_REF_RESOURCE
-  * bit 4	F2FS_FOLIO_PRIVATE_ATOMIC_WRITE
-  * bit 5-	f2fs private data
++ * bit 2	F2FS_FOLIO_PRIVATE_REF_RESOURCE
++ * bit 3	F2FS_FOLIO_PRIVATE_ATOMIC_WRITE
+  * bit 4-	f2fs private data
   *
   * Layout B: lowest bit should be 0
 - * page.private is a wrapped pointer.
 + * folio->private is a wrapped pointer.
   */
  enum {
 -	PAGE_PRIVATE_NOT_POINTER,		/* private contains non-pointer data */
 -	PAGE_PRIVATE_ONGOING_MIGRATION,		/* data page which is on-going migrating */
 -	PAGE_PRIVATE_REF_RESOURCE,		/* dirty page has referenced resources */
 -	PAGE_PRIVATE_ATOMIC_WRITE,		/* data page from atomic write path */
 -	PAGE_PRIVATE_MAX
 +	F2FS_FOLIO_PRIVATE_NOT_POINTER,		/* private contains non-pointer data */
 +	F2FS_FOLIO_PRIVATE_ONGOING_MIGRATION,		/* data page which is on-going migrating */
- 	F2FS_FOLIO_PRIVATE_INLINE_INODE,		/* inode page contains inline data */
 +	F2FS_FOLIO_PRIVATE_REF_RESOURCE,		/* dirty page has referenced resources */
 +	F2FS_FOLIO_PRIVATE_ATOMIC_WRITE,		/* data page from atomic write path */
 +	F2FS_FOLIO_PRIVATE_MAX
  };
  
  /* For compression */
@@@ -2710,22 -2801,25 +2785,19 @@@ static inline void folio_clear_f2fs_##n
  		folio_detach_private(folio);				\
  	else								\
  		folio->private = (void *)v;				\
 -}									\
 -static inline void clear_page_private_##name(struct page *page) \
 -{ \
 -	clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
 -	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) \
 -		detach_page_private(page); \
  }
  
 -PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);
 -PAGE_PRIVATE_GET_FUNC(gcing, ONGOING_MIGRATION);
 -PAGE_PRIVATE_GET_FUNC(atomic, ATOMIC_WRITE);
 +F2FS_FOLIO_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);
- F2FS_FOLIO_PRIVATE_GET_FUNC(inline, INLINE_INODE);
 +F2FS_FOLIO_PRIVATE_GET_FUNC(gcing, ONGOING_MIGRATION);
 +F2FS_FOLIO_PRIVATE_GET_FUNC(atomic, ATOMIC_WRITE);
  
 -PAGE_PRIVATE_SET_FUNC(reference, REF_RESOURCE);
 -PAGE_PRIVATE_SET_FUNC(gcing, ONGOING_MIGRATION);
 -PAGE_PRIVATE_SET_FUNC(atomic, ATOMIC_WRITE);
 +F2FS_FOLIO_PRIVATE_SET_FUNC(reference, REF_RESOURCE);
- F2FS_FOLIO_PRIVATE_SET_FUNC(inline, INLINE_INODE);
 +F2FS_FOLIO_PRIVATE_SET_FUNC(gcing, ONGOING_MIGRATION);
 +F2FS_FOLIO_PRIVATE_SET_FUNC(atomic, ATOMIC_WRITE);
  
 -PAGE_PRIVATE_CLEAR_FUNC(reference, REF_RESOURCE);
 -PAGE_PRIVATE_CLEAR_FUNC(gcing, ONGOING_MIGRATION);
 -PAGE_PRIVATE_CLEAR_FUNC(atomic, ATOMIC_WRITE);
 +F2FS_FOLIO_PRIVATE_CLEAR_FUNC(reference, REF_RESOURCE);
- F2FS_FOLIO_PRIVATE_CLEAR_FUNC(inline, INLINE_INODE);
 +F2FS_FOLIO_PRIVATE_CLEAR_FUNC(gcing, ONGOING_MIGRATION);
 +F2FS_FOLIO_PRIVATE_CLEAR_FUNC(atomic, ATOMIC_WRITE);
  
  static inline unsigned long folio_get_f2fs_data(struct folio *folio)
  {
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 --]