On Wed, 2011-01-12 at 19:03 +0100, 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, 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. Generally git rebase --onto helps a lot on these cases. I also like to use interactive rebase to check if the patches are correct. So, something like: $ git rebase -i --onto linus/master tony/master <current branch> will rebase current branch on top of linus/master considering that old head was tony/master. You can also use commit ids instead of remote heads, of course. -- balbi -- 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
