From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <benh@kernel.crashing.org>
Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTPS id 2440ADDF3A
	for <linuxppc-dev@ozlabs.org>; Mon, 14 Jul 2008 18:37:53 +1000 (EST)
Subject: Re: Updates to powerpc.git
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
In-Reply-To: <20080714154918.d5064b3c.sfr@canb.auug.org.au>
References: <1215588881.8970.358.camel@pasglop>
	<1216013556.7549.244.camel@pasglop>
	<20080714154918.d5064b3c.sfr@canb.auug.org.au>
Content-Type: text/plain
Date: Mon, 14 Jul 2008 18:37:36 +1000
Message-Id: <1216024656.7549.264.camel@pasglop>
Mime-Version: 1.0
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
	Andrew Morton <akpm@linux-foundation.org>
Reply-To: benh@kernel.crashing.org
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/options/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>

On Mon, 2008-07-14 at 15:49 +1000, Stephen Rothwell wrote:
> Hi Ben,
> 
> On Mon, 14 Jul 2008 15:32:36 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> >
> > -next and -merge are now both to the same level, which is the same
> 
> I think you meant -master (not -merge).

Yup, typo, sorry.

-merge will be updated to that level if -next is happy.

Cheers,
Ben.