From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936593AbdEWIiU (ORCPT ); Tue, 23 May 2017 04:38:20 -0400 Received: from foss.arm.com ([217.140.101.70]:47792 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933001AbdEWIiQ (ORCPT ); Tue, 23 May 2017 04:38:16 -0400 Date: Tue, 23 May 2017 09:37:22 +0100 From: Mark Rutland To: Stephen Rothwell 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: <20170523083721.GA14542@leverpostej> References: <20170522132711.22b80ff5@canb.auug.org.au> <20170522083214.GA1478@leverpostej> <20170523074456.353423fb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170523074456.353423fb@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Tue, May 23, 2017 at 07:44:56AM +1000, Stephen Rothwell wrote: > 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. Thanks for the pointer; there was a stale copy there, which has now been zapped. Hopefully we're conflict-free for next-20170524. Thanks for the heads-up! Mark.