From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751918AbcGRMTy (ORCPT <rfc822;w@1wt.eu>);
	Mon, 18 Jul 2016 08:19:54 -0400
Received: from ozlabs.org ([103.22.144.67]:53426 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751557AbcGRMTw (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 18 Jul 2016 08:19:52 -0400
Date: Mon, 18 Jul 2016 22:19:49 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Kees Cook <keescook@google.com>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Christophe Leroy <christophe.leroy@c-s.fr>,
        "oss@buserror.net" <oss@buserror.net>
Subject: Re: linux-next: manual merge of the kspp tree with the powerpc tree
Message-ID: <20160718221949.620fba2c@canb.auug.org.au>
In-Reply-To: <871t2rb496.fsf@@concordia.ellerman.id.au>
References: <20160718130315.314f8a77@canb.auug.org.au>
	<871t2rb496.fsf@@concordia.ellerman.id.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Michael,

On Mon, 18 Jul 2016 21:00:05 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > from the powerpc tree and commit:  
> 
> Actually that's in Scott's tree.

Oops, sorry.

> > Michael: time to sort these selects?  
> 
> Yeah I was thinking that the other day. Not sure when is a good time though.

Just after -rc1, before you open the powerpc tree up again so most of
the powerpc patches can be based after it.  Also a good time to update
the config files if necessary.

-- 
Cheers,
Stephen Rothwell