From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Bottomley Subject: Re: linux-next: first tree Date: Thu, 14 Feb 2008 15:26:21 -0600 Message-ID: <1203024381.3158.26.camel@localhost.localdomain> References: <20080215003537.8911ce35.sfr@canb.auug.org.au> <47B4AC97.3040001@garzik.org> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from accolon.hansenpartnership.com ([76.243.235.52]:47391 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754464AbYBNV03 (ORCPT ); Thu, 14 Feb 2008 16:26:29 -0500 In-Reply-To: <47B4AC97.3040001@garzik.org> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Jeff Garzik Cc: Stephen Rothwell , Andrew Morton , linux-next@vger.kernel.org, LKML , Linux IDE mailing list On Thu, 2008-02-14 at 16:03 -0500, Jeff Garzik wrote: > Stephen Rothwell wrote: > > Also, more trees please ... :-) > > Please add the 'NEXT' branch of > git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git > > to your list. This is a throwaway meta-branch that is rebased often. > > The 'master' branch of libata-dev.git always contains the base commit > from torvalds/linux-2.6.git from which all other branches are based. I > never ever commit to the 'master' branch, only update it from > torvalds/linux-2.6.git. > > > Andrew, > > I will continue to maintain the 'ALL' branch exactly as before. It may > contain changes not suitable for 'NEXT', but suitable for -mm testing. > > In my new development process, things will almost always land in 'ALL' > before 'NEXT'. So does this indicate the meaning of upstream and upstream-fixes is still the same? I always took upstream-fixes to be bug fixes for this -rc and upstream as queued for the next merge window, in which case NEXT would be the union of those two sets? James