From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965145AbdEVVpD (ORCPT ); Mon, 22 May 2017 17:45:03 -0400 Received: from ozlabs.org ([103.22.144.67]:44847 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbdEVVpB (ORCPT ); Mon, 22 May 2017 17:45:01 -0400 Date: Tue, 23 May 2017 07:44:56 +1000 From: Stephen Rothwell To: Mark Rutland Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , Linux Kernel Mailing List , Catalin Marinas Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Message-ID: <20170523074456.353423fb@canb.auug.org.au> In-Reply-To: <20170522083214.GA1478@leverpostej> References: <20170522132711.22b80ff5@canb.auug.org.au> <20170522083214.GA1478@leverpostej> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mark, On Mon, 22 May 2017 09:32:15 +0100 Mark Rutland wrote: > > Just to check, is your copy of tip up-to-date? Yes, it was fetched just before being merged. I use the auto-latest branch of the tip tree which may not be as up to date as the master branch. > That latter commit was in the tip smp/hotplug branch, but that branch > was reset to v4.12-rc1 a few days ago (before the first commit was sent > to Linus), specifically to avoid this conflict. > > ... did we miss another branch that was merged into, perhaps? Presumably, but that's ok - I assume it will come good eventually. > The good news is that the commit in Linus' tree is the correct fix. :) Well, except that I only fixed up that one spot, the rest of the commit from the tip tree was still there. > The other commit was a slightly broken prior attempt, and shouldn't be > in the tip tree any more. OK. -- Cheers, Stephen Rothwell