On Wed, 12 Jan 2011, Koen Kooi wrote: > Op 11 jan 2011, om 17:34 heeft Tony Lindgren het volgende geschreven: > > > * Anand Gadiyar <gadiyar@xxxxxx> [110111 03:04]: > >> Koen Kooi wrote: > >>> Are there any plans to do a 2.6.37-omap1 tag? > >> > >> Given that linux-omap is now closely tracking mainline, is > >> this still needed? > > > > Those tags are no longer needed, the mainline kernel is now the > > stable kernel and should be used as the base for any distros > > or products. > > It turns out that l-o head (.37-rc8 currently) and Linus' .37 differ a > lot, Tony's master branch is basically a development branch. It's rebuilt often, and it's up to Tony what gets added or dropped. The patches that Tony sends to linux-next, and then Linus, go into Tony's omap-for-linus branch. That branch includes changes from other OMAP maintainers or submaintainers, like Kevin, Benoît, myself, etc. A significant amount of effort is focused after -rc6 making sure that omap-for-linus builds cleanly and that features important to us work. Of course, sometimes we miss things, but in general, omap-for-linus receives much more OMAP maintainer testing than Tony's master branch. > so after spending an evening fruitlessly trying to rebase my > patches on top of Linus' .37 I decided to go the other way and just do > 'git format-patch v2.6.37-rc8..v2.6.37', apply those on top of l-o rc8 > and then rebase my patchset on top of that. That was 5 minutes of work. Sounds fine if you are creating Koenux. If not, I guess you'll eventually need to rebase the patches on mainline anyway. - Paul
