From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw0-f175.google.com (mail-yw0-f175.google.com [209.85.211.175]) by ozlabs.org (Postfix) with ESMTP id B3A3CB6F15 for ; Thu, 10 Dec 2009 00:40:38 +1100 (EST) Received: by ywh5 with SMTP id 5so7166613ywh.11 for ; Wed, 09 Dec 2009 05:40:34 -0800 (PST) MIME-Version: 1.0 Sender: glikely@secretlab.ca In-Reply-To: <4B1F6D3A.3030500@pengutronix.de> References: <4B1F6D3A.3030500@pengutronix.de> From: Grant Likely Date: Wed, 9 Dec 2009 06:40:11 -0700 Message-ID: Subject: Re: 2.6.33 -next tree To: Luotao Fu Content-Type: text/plain; charset=ISO-8859-1 Cc: linuxppc-dev List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Dec 9, 2009 at 2:26 AM, Luotao Fu wrote: > Hi Grant, > > Grant Likely wrote: >> Hi Ben, Stephen. >> >> I just prepared my next branch for 2.6.33: >> git://git.secretlab.ca/git/linux-2.6 next >> > > Just for curiosity: I noticed that you keep so far the further patches for the > dedicated spi controller on mpc5200 in the next-spi tree. Any plan when they > will be merged to the -next tree? Like mentioned before, some of them are > essential, without which the driver doesn't work (at least on my board) I based the next-spi tree on my regular next tree (which was convenient, but lead to it looking like I had inappropriate stuff in my spi tree). Once Ben asks Linus to pull his tree it will all look correct. I'll ask Linux to pull my next-spi tree directly after Ben's tree is in. g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.