* linux-next: manual merge of the maple tree with the parisc tree
@ 2022-02-22 23:59 broonie
0 siblings, 0 replies; only message in thread
From: broonie @ 2022-02-22 23:59 UTC (permalink / raw)
To: Liam Howlett
Cc: Dave Anglin, Helge Deller, Liam R . Howlett, Liam R . Howlett,
Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox
Hi all,
Today's linux-next merge of the maple tree got a conflict in:
arch/parisc/kernel/cache.c
between commit:
389f36b709496 ("parisc: Add vDSO support")
from the parisc tree and commit:
57723d1d4d3fc ("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.
diff --cc arch/parisc/kernel/cache.c
index e7b8e74dad8e1,c3a8d29b6f9fe..0000000000000
--- 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-22 23:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-22 23:59 linux-next: manual merge of the maple tree with the parisc tree broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®