Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
include/linux/mm_types.h
mm/huge_memory.c
between commit:
8b1b436dd1cc ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
from the tip tree and commits:
16af97dc5a89 ("mm: migrate: prevent racy access to tlb_flush_pending")
a9b802500ebb ("Revert "mm: numa: defer TLB flush for THP migration as long as possible"")
from the akpm-current tree.
The latter 2 are now in Linus' tree as well (but were not when I started
the day).
The only way forward I could see was to revert
8b1b436dd1cc ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
and the three following commits
ff7a5fb0f1d5 ("overlayfs, locking: Remove smp_mb__before_spinlock() usage")
d89e588ca408 ("locking: Introduce smp_mb__after_spinlock()")
a9668cd6ee28 ("locking: Remove smp_mb__before_spinlock()")
before merging the akpm-current tree again.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
