* Pandita, Vikram <vikram.pandita@xxxxxx> [090625 17:08]: > > > >-----Original Message----- > >From: linux-omap-owner@xxxxxxxxxxxxxxx [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of Tony > > > >Hi, > > > >* Ryan <ryanphilips19@xxxxxxxxxxxxxx> [090624 12:42]: > >> Hi, > >> Looking at the linux-omap tree using the gitweb interface. Apart > >> from the "master" branch and tags. > >> why do we have lots of branches? How and when do they intertact 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 patches > >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. > > Are you recommending that future patches posted to l-o list should be based of kernel.org > 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" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
