* Otto Solares <solca@xxxxxxxx> [090217 16:00]: > On Tue, Feb 17, 2009 at 03:50:18PM -0800, Tony Lindgren wrote: > > Aaro, can you please send a proper patch with Signed-off-by and I'll > > add it to omap-fixes? > > Tony: what's the purpose of omap-fixes and the difference between > master and omap-2.6.28? if I want a "stable" kernel which branch > should I use? Here's the quick rundown: - master branch is current linux-omap against recent mainline kernel - omap-fixes is the branch for fixes going to mainline during -rc cycle - omap-upstream is a branch of generic omap patches going to mainline during the next merge window - omap1-upstream is a branch of omap1 patches going to mainline during the next merge cycle - omap2-upstream is a branch of omap2 patches going to mainline during the next merge cycle - omap3-upstream is a branch of omap3 patches going to mainline during the next merge cycle - omap-next branch is what gets pulled into linux-next and gets merged to the mainline the next merge window The omap-2.6.28 branch is there because there were few bugs and I thought we might want to tag v2.6.28-omap2. Mostly getting the MMC working for omap1 as far as I remember. For "stable" you should use the whatever omap tag we have against the recent mainline kernel, so yeah, it would be the omap-2.6.28 branch right now. 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
