linux-next: manual merge of the risc-v tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/riscv/kernel/vdso.c

between commit:

  9b580a1d60de ("riscv: use vma iterator for vdso")

from Linus' tree and commit:

  a8616d2dc193 ("riscv: vdso: fix NULL deference in vdso_join_timens() when vfork")

from the risc-v 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 arch/riscv/kernel/vdso.c
index 692e7ae3dcb8,4abc9aebdfae..000000000000
--- a/arch/riscv/kernel/vdso.c
+++ b/arch/riscv/kernel/vdso.c
@@@ -114,16 -119,18 +119,19 @@@ int vdso_join_timens(struct task_struc
  {
  	struct mm_struct *mm = task->mm;
  	struct vm_area_struct *vma;
 +	VMA_ITERATOR(vmi, mm, 0);
- 	struct __vdso_info *vdso_info = mm->context.vdso_info;
  
  	mmap_read_lock(mm);
  
 -	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 +	for_each_vma(vmi, vma) {
  		unsigned long size = vma->vm_end - vma->vm_start;
  
- 		if (vma_is_special_mapping(vma, vdso_info->dm))
+ 		if (vma_is_special_mapping(vma, vdso_info.dm))
  			zap_page_range(vma, vma->vm_start, size);
+ #ifdef CONFIG_COMPAT
+ 		if (vma_is_special_mapping(vma, compat_vdso_info.dm))
+ 			zap_page_range(vma, vma->vm_start, size);
+ #endif
  	}
  
  	mmap_read_unlock(mm);

Attachment: pgpcAYGpz0pq1.pgp
Description: OpenPGP digital signature