linux-next: manual merge of the maple tree with the parisc-hd tree

linux-next: manual merge of the maple tree with the parisc-hd tree

[Stephen Rothwell]

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

Hi all,

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

  arch/parisc/kernel/cache.c

between commit:

  aca41f39ad08 ("parisc: Add vDSO support")

from the parisc-hd tree and commit:

  59f11d074faa ("parisc: Remove mmap linked list from cache handling")

from the maple 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/parisc/kernel/cache.c
index a08f8499b720,c3a8d29b6f9f..000000000000
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@@ -582,8 -585,8 +585,8 @@@ void flush_cache_mm(struct mm_struct *m
  	}
  
  	preempt_disable();
 -	if (mm->context == mfsp(3)) {
 +	if (mm->context.space_id == mfsp(3)) {
- 		for (vma = mm->mmap; vma; vma = vma->vm_next)
+ 		for_each_vma(vmi, vma)
  			flush_user_cache_tlb(vma, vma->vm_start, vma->vm_end);
  		preempt_enable();
  		return;

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