From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752769AbdHKL4N (ORCPT ); Fri, 11 Aug 2017 07:56:13 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:37415 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbdHKL4L (ORCPT ); Fri, 11 Aug 2017 07:56:11 -0400 Date: Fri, 11 Aug 2017 13:56:07 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Peter Zijlstra , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Linux-Next Mailing List , Linux Kernel Mailing List , Nadav Amit , Linus Subject: Re: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20170811115607.p2vgqcp7w3wurhvw@gmail.com> References: <20170811175326.36d546dc@canb.auug.org.au> <20170811093449.w5wttpulmwfykjzm@hirez.programming.kicks-ass.net> <20170811214556.322b3c4e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170811214556.322b3c4e@canb.auug.org.au> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi Peter, > > On Fri, 11 Aug 2017 11:34:49 +0200 Peter Zijlstra 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 ... I've done a minimal conflict resolution merge locally. Peter, could you please double check my resolution, in: 040cca3ab2f6: Merge branch 'linus' into locking/core, to resolve conflicts Thanks, Ingo