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. > > > 17 hours ago omap1-upstream shortlog | log | tree > 17 hours ago omap2-upstream shortlog | log | tree > 17 hours ago omap3-boards shortlog | log | tree > 17 hours ago omap3-upstream shortlog | log | tree > 17 hours ago omap4 shortlog | log | tree > 17 hours ago pm shortlog | log | tree > 19 hours ago omap-headers shortlog | log | tree > 19 hours ago omap-upstream shortlog | log | tree > 19 hours ago omap-fixes shortlog | log | tree > 47 hours ago master shortlog | log | tree > 2 weeks ago omap-decimate shortlog | log | tree > 2 weeks ago omapfb-upstream shortlog | log | tree > 2 weeks ago omap-pool shortlog | log | tree > 3 weeks ago for-next-2.6.30 shortlog | log | tree > 4 weeks ago for-next shortlog | log | tree > 4 weeks ago iommu shortlog | log | tree > 2 months ago omap-2.6.29 shortlog | log | tree > 3 months ago clks-testing shortlog | log | tree > 3 months ago delete shortlog | log | tree > 4 months ago omap-2.6.28 shortlog | log | tree > 4 months ago tidspbridge shortlog | log | tree > 5 months ago dspgateway shortlog | log | tree > 5 months ago linus shortlog | log | tree > 6 months ago musb shortlog | log | tree > > > 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. 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
