[RFC] [Maverick] Pull ti-omap4 branch

Jan, Sebastien s-jan at ti.com
Sat Jun 19 08:26:08 UTC 2010


Hi Amit,

I agree with you and I shall have developed more my answer:
we plan to have an intermediate re-base on a .35-rc kernel, as you suggest.
We shall have this update available beginning of August.

Regards,
Sebastien

Texas Instruments France SA, 821 Avenue Jack Kilby, 06270 Villeneuve Loubet. 036 420 040 R.C.S Antibes. Capital de EUR 753.920

________________________________________

De : Amit Kucheria [amit.kucheria at canonical.com]
Date d'envoi : vendredi 18 juin 2010 15:11
À : Jan, Sebastien
Cc : bryan.wu at canonical.com; kernel-team; Oliver Grawert; Leann Ogasawara; Andy Whitcroft; Dechesne, Nicolas
Objet : Re: [RFC] [Maverick] Pull ti-omap4 branch

On 10 Jun 17, Sebastien Jan wrote:
> On 06/17/2010 03:45 PM, Bryan Wu wrote:
> > On 06/17/2010 09:38 PM, Tim Gardner wrote:
> [...]
> >> Is the plan to try and integrate OMAP4 into the master branch when TI
> >> releases their 2.6.35 kernel? If so, Sept 2 is the last possible date
> >> that we'll consider attempting that integration as that gives us only 2
> >> weeks before kernel freeze (Sept 16).
> >>
> >
> > Considering the patches in OMAP4 branch but missing the .35 merge window, I
> > believe it will impact our master branch a lot. I prefer that we will give up
> > OMAP4 branch in M+1 if all the OMAP4 patches are in mainline. Now we have OMAP3
> > in our master as a flavor, but in Lucid ti-omap is a separated branch.
> >
> >> Otherwise we'll just have to carry OMAP4 as a Maverick topic branch.
> >>
> >
> > Yeah, that's our plan now.
> >
> > Sebastien, can you add any input? When will we get .35 based TI OMAP4 tree?
>
> We are aligned: for Maverick, unfortunately OMAP4 support will have to be in a branch because of the pile of patches that is still on top of the mainline.
>
> Regarding OMAP4 rebase on .35, it's too early for me to comment. We are committed to do it, so it shall be available a few days or short weeks after the .35, but difficult to be more precise by now.
>

(Looping in Nicolas)

Sebastien,

We should _not_ wait for 2.6.35 to be released to get the first patch drop
into Ubuntu.

2.6.35 is already at -rc3, so there is unlikely to be any core API changes in
the kernel. The patches going into the plat-omap and mach-omap will also be
down to a few bugfixes.

So, IMHO, TI should rebase on top of -rc3 or -rc4 and get this into Ubuntu.
There after, it will be a lot easier rebasing it to the point when 2.6.35 is
final.

Regards,
Amit

--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------





More information about the kernel-team mailing list