Hi Peter, On Fri, 11 Aug 2017 11:34:49 +0200 Peter Zijlstra <[email protected]> wrote: > > On Fri, Aug 11, 2017 at 05:53:26PM +1000, Stephen Rothwell wrote: > > > > 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). > > Here's two patches that apply on top of tip.
What I will really need (on Monday) is a merge resolution between Linus' tree and the tip tree ... -- Cheers, Stephen Rothwell
