2.6.37-omap1 tag?

2.6.37-omap1 tag?

[Koen Kooi]

Hi,

Are there any plans to do a 2.6.37-omap1 tag?

regards,

Koen

RE: 2.6.37-omap1 tag?

[Anand Gadiyar]

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?

- Anand

Re: 2.6.37-omap1 tag?

[Tony Lindgren]

* Anand Gadiyar <gadiyar@ti.com> [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.

Regards,

Tony

Re: 2.6.37-omap1 tag?

[Koen Kooi]

Op 11 jan 2011, om 17:34 heeft Tony Lindgren het volgende geschreven:

> * Anand Gadiyar <gadiyar@ti.com> [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.

regards,

Koen

Re: 2.6.37-omap1 tag?

[Paul Walmsley]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1654 bytes --]

On Wed, 12 Jan 2011, Koen Kooi wrote:

> Op 11 jan 2011, om 17:34 heeft Tony Lindgren het volgende geschreven:
> 
> > * Anand Gadiyar <gadiyar@ti.com> [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

Re: 2.6.37-omap1 tag?

[Felipe Balbi]

Hi,

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@ti.com> [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' .37differ 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.
> 
> regards,
> 
> Koen--
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


-- 
balbi

Re: 2.6.37-omap1 tag?

[Felipe Balbi]

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@ti.com> [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