Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754209AbYKNAWi (ORCPT ); Thu, 13 Nov 2008 19:22:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753381AbYKNAWY (ORCPT ); Thu, 13 Nov 2008 19:22:24 -0500 Received: from kroah.org ([198.145.64.141]:58579 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751878AbYKNAWX (ORCPT ); Thu, 13 Nov 2008 19:22:23 -0500 Date: Thu, 13 Nov 2008 16:22:03 -0800 From: Greg KH To: "J.R. Mauro" Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: Can you add the staging tree to -next? Message-ID: <20081114002203.GA20272@kroah.com> References: <20081112235600.GA27554@kroah.com> <20081114104421.772feee3.sfr@canb.auug.org.au> <20081114000133.GA19644@kroah.com> <3aaafc130811131613j1f4425deodcb3b3f9fd330653@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3aaafc130811131613j1f4425deodcb3b3f9fd330653@mail.gmail.com> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1596 Lines: 40 On Thu, Nov 13, 2008 at 07:13:40PM -0500, J.R. Mauro wrote: > On Thu, Nov 13, 2008 at 7:01 PM, Greg KH wrote: > > On Fri, Nov 14, 2008 at 10:44:21AM +1100, Stephen Rothwell wrote: > >> Hi Greg, > >> > >> On Wed, 12 Nov 2008 15:56:00 -0800 Greg KH wrote: > >> > > >> > I'm starting to get people sending me patches against -next for the > >> > drivers/staging/ tree that don't apply as -next does not include my > >> > quilt tree of staging patches. > >> > > >> > Can you please pick it up? You can put it at the end of your series, > >> > and the 'make allmodconfig' option disables building anything in the > >> > drivers/staging/ subdirectory, so it should not have any build or merge > >> > conflicts with anything. > >> > > >> > It can be found at: > >> > http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ > >> > and is a quilt tree. > >> > > >> > It will follow all the same rules as other trees, with patches only for > >> > the next merge window (2.6.29 right now) in it. > >> > >> OK, I have added it starting today. > > > > Thank you very much, I appreciate it. > > Greg, will this suffice for having a git repo for staging, or are you > still planning on a discrete staging repo? For now, this is probably going to be sufficient for me, how about you? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/