From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: git tree Date: Thu, 25 Jun 2009 17:40:49 +0300 Message-ID: <20090625144048.GU7352@atomide.com> References: <376636be0906240234n2b9f9e77g12c8a6494bbd245e@mail.gmail.com> <20090624111024.GO7352@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:59703 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbZFYOkv (ORCPT ); Thu, 25 Jun 2009 10:40:51 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Pandita, Vikram" Cc: Ryan , "linux-omap@vger.kernel.org" * Pandita, Vikram [090625 17:08]: >=20 >=20 > >-----Original Message----- > >From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger= =2Ekernel.org] On Behalf Of Tony > > > >Hi, > > > >* Ryan [090624 12:42]: > >> Hi, > >> =A0 Looking at the linux-omap tree using the gitweb interface. Apa= rt > >> from the "master" branch and tags. > >> =A0 why do we have lots of branches? How and when do they intertac= t with > >> each other. > >> > >> Can anyone explain what exactly goes into each of them? > >> Some are straight forward like pm, usb, tidspbridge, gateway. not = sure > >> about for-next-2.6.30, omap-fixes. > > > >More or less the various branches are topic branches of patches > >going to the mainline kernel. For example, omap-fixes contains fixes= to > >be sent during the -rc cycle, omap-upstream contains omap common pat= ches > >for the next merge window, omap1-upstream omap1 specific patches for > >the next merge window and so on. > > > >The master branch is more or less merge of all the topic branches. > >Currently missing from it are the pm branch and the dss2 branch. > > > >> Trying to understand things/mode of development in here. > > > >Hope this helps. In general, your should now be able to do almost > >all the patches against Linus' mainline kernel. Of course until > >we get pm and dss2 into the mainline kernel, those patches need to > >be done against pm and dss2 branches. > > > >So everybody, where possible, please base all the patches against > >Linus' kernel stable something or -rc someting, that way they are > >easy to merge in. >=20 > Are you recommending that future patches posted to l-o list should be= based of kernel.org=20 > and not master of l-o? Yeah, for all the patches that do not have dependencies to other topic branches such as pm, dss2. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html