From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Rutland <mark.rutland@arm.com>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree
Date: Tue, 23 May 2017 09:37:22 +0100
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
Return-path: <linux-next-owner@vger.kernel.org>
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 <rfc822;linux-next@vger.kernel.org>);
        Tue, 23 May 2017 04:38:16 -0400
Content-Disposition: inline
In-Reply-To: <20170523074456.353423fb@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Catalin Marinas <catalin.marinas@arm.com>

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 <mark.rutland@arm.com> 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.