Hi all,

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

  lib/vdso/datastore.c

between commit:

  5f5ffe21e7530e ("mm: rename zap_vma_pages() to zap_vma()")

from the mm-unstable tree and commit:

  5dc9cf835aba73 ("vdso/timens: Move functions to new file")

from the tip 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 lib/vdso/datastore.c
index 222c143aebf764,cf5d784a4a5a14..00000000000000
--- a/lib/vdso/datastore.c
+++ b/lib/vdso/datastore.c
diff --git a/kernel/time/namespace_vdso.c b/kernel/time/namespace_vdso.c
index 88c075cd16a361..0d74d160eec98b 100644
--- a/kernel/time/namespace_vdso.c
+++ b/kernel/time/namespace_vdso.c
@@ -134,7 +134,7 @@ static int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
 	guard(mmap_read_lock)(mm);
 	for_each_vma(vmi, vma) {
 		if (vma_is_special_mapping(vma, &vdso_vvar_mapping))
-			zap_vma_pages(vma);
+			zap_vma(vma);
 	}
 	return 0;
 }