linux-fbdev-devel

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Tony L. <to...@at...>]

* Artem Bityutskiy <ded...@gm...> [091111 21:05]:
> On Wed, 2009-11-11 at 10:42 -0800, Tony Lindgren wrote:
> > * Tomi Valkeinen <tom...@no...> [091111 01:43]:
> > > On Wed, 2009-11-11 at 09:45 +0100, Valkeinen Tomi (Nokia-D/Helsinki)
> > > wrote:
> > > > On Tue, 2009-11-10 at 13:40 +0100, Artem Bityutskiy wrote:
> > > > > Tomi,
> > > > > 
> > > > > could you please kindly ask Stephen (CCed) to include the DSS2 tree into
> > > > > linux-next, because you are going to merge it the next merge window, and
> > > > > there does not seem to be any blocker for this.
> > > > > 
> > > > > Being in linux-next for a while is really important.
> > > > 
> > > > Stephen, would this be possible? DSS2 driver is rather big piece of
> > > > code, even if it's quite isolated, so it would be nice to have it in
> > > > linux-next.
> > > > 
> > > > What does it require from me? A git tree, obviously, but what should it
> > > > be based on?
> > > 
> > > Ah, I just realized that DSS2 patches depend on patches from Tony's
> > > tree. I guess I should base my tree on top of some Tony's tree that is
> > > going to linux-next?
> > 
> > Or I can merge them into my for-next if that's OK with everybody. This
> > merge cycle is a pain for omap as we've moved all the common headers from
> > include/mach to include/plat.
> 
> I thought everything stable which you are going to merge next merge
> window should be in the next branch by default. Especially these massive
> re-names which potentially may break many things, right?

Yes, the renames are already there.

Tony

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Stephen R. <sf...@ca...>]

Hi Tony,

On Wed, 11 Nov 2009 10:42:09 -0800 Tony Lindgren <to...@at...> wrote:
>
> * Tomi Valkeinen <tom...@no...> [091111 01:43]:
> > On Wed, 2009-11-11 at 09:45 +0100, Valkeinen Tomi (Nokia-D/Helsinki)
> > wrote:
> > > On Tue, 2009-11-10 at 13:40 +0100, Artem Bityutskiy wrote:
> > > > 
> > > > could you please kindly ask Stephen (CCed) to include the DSS2 tree into
> > > > linux-next, because you are going to merge it the next merge window, and
> > > > there does not seem to be any blocker for this.
> > > > 
> > > > Being in linux-next for a while is really important.
> > > 
> > > Stephen, would this be possible? DSS2 driver is rather big piece of
> > > code, even if it's quite isolated, so it would be nice to have it in
> > > linux-next.
> > > 
> > > What does it require from me? A git tree, obviously, but what should it
> > > be based on?
> > 
> > Ah, I just realized that DSS2 patches depend on patches from Tony's
> > tree. I guess I should base my tree on top of some Tony's tree that is
> > going to linux-next?
> 
> Or I can merge them into my for-next if that's OK with everybody. This
> merge cycle is a pain for omap as we've moved all the common headers from
> include/mach to include/plat.

If the DSS2 patches really are dependent on other stuff in the omap tree,
then this is probably the best plan.
-- 
Cheers,
Stephen Rothwell                    sf...@ca...
http://www.canb.auug.org.au/~sfr/

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Tony L. <to...@at...>]

* Stephen Rothwell <sf...@ca...> [091111 21:10]:
> Hi Tony,
> 
> On Wed, 11 Nov 2009 10:42:09 -0800 Tony Lindgren <to...@at...> wrote:
> >
> > * Tomi Valkeinen <tom...@no...> [091111 01:43]:
> > > On Wed, 2009-11-11 at 09:45 +0100, Valkeinen Tomi (Nokia-D/Helsinki)
> > > wrote:
> > > > On Tue, 2009-11-10 at 13:40 +0100, Artem Bityutskiy wrote:
> > > > > 
> > > > > could you please kindly ask Stephen (CCed) to include the DSS2 tree into
> > > > > linux-next, because you are going to merge it the next merge window, and
> > > > > there does not seem to be any blocker for this.
> > > > > 
> > > > > Being in linux-next for a while is really important.
> > > > 
> > > > Stephen, would this be possible? DSS2 driver is rather big piece of
> > > > code, even if it's quite isolated, so it would be nice to have it in
> > > > linux-next.
> > > > 
> > > > What does it require from me? A git tree, obviously, but what should it
> > > > be based on?
> > > 
> > > Ah, I just realized that DSS2 patches depend on patches from Tony's
> > > tree. I guess I should base my tree on top of some Tony's tree that is
> > > going to linux-next?
> > 
> > Or I can merge them into my for-next if that's OK with everybody. This
> > merge cycle is a pain for omap as we've moved all the common headers from
> > include/mach to include/plat.
> 
> If the DSS2 patches really are dependent on other stuff in the omap tree,
> then this is probably the best plan.

OK. The only dependency is the the move of the headers.

Tomi, can you please rebase your patches on top of the "7xx-iosplit-plat-merge"
branch in linux-omap tree? This is commit 8171d88089ad63fc442b2bf32af7c18653adc5cb,
and it should stay static.

Please don't rebase on the for-next branch in linux-omap tree, that's still
changing.

Regards,

Tony

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Stephen R. <sf...@ca...>]

Hi Tony, Tomi,

On Thu, 12 Nov 2009 10:14:57 -0800 Tony Lindgren <to...@at...> wrote:
>
> OK. The only dependency is the the move of the headers.
> 
> Tomi, can you please rebase your patches on top of the "7xx-iosplit-plat-merge"
> branch in linux-omap tree? This is commit 8171d88089ad63fc442b2bf32af7c18653adc5cb,
> and it should stay static.

OK, *if* you (Tony) guarantee that the base is stable (i.e. never
rebased, but may have things added to it) and in linux-next, then I can
take the DSS2 stuff separately if you want me to.

Tomi, you can, of course, merge that branch into your tree instead of
rebasing on top of it (which ever is easiest).

-- 
Cheers,
Stephen Rothwell                    sf...@ca...
http://www.canb.auug.org.au/~sfr/

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Tomi V. <tom...@no...>]

Hi,

On Thu, 2009-11-12 at 21:48 +0100, ext Stephen Rothwell wrote:
> Hi Tony, Tomi,
> 
> On Thu, 12 Nov 2009 10:14:57 -0800 Tony Lindgren <to...@at...> wrote:
> >
> > OK. The only dependency is the the move of the headers.
> > 
> > Tomi, can you please rebase your patches on top of the "7xx-iosplit-plat-merge"
> > branch in linux-omap tree? This is commit 8171d88089ad63fc442b2bf32af7c18653adc5cb,
> > and it should stay static.
> 
> OK, *if* you (Tony) guarantee that the base is stable (i.e. never
> rebased, but may have things added to it) and in linux-next, then I can
> take the DSS2 stuff separately if you want me to.
> 
> Tomi, you can, of course, merge that branch into your tree instead of
> rebasing on top of it (which ever is easiest).

I rebased DSS2 on top of 8171d88089ad63fc442b2bf32af7c18653adc5cb. It
can be found from git://gitorious.org/linux-omap-dss2/linux.git for-next
branch.

I'm ok with Tony pulling DSS2 to his next-branch, or Stephen pulling
directly, which ever works easier for you.

 Tomi

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Tony L. <to...@at...>]

* Tomi Valkeinen <tom...@no...> [091113 01:55]:
> Hi,
> 
> On Thu, 2009-11-12 at 21:48 +0100, ext Stephen Rothwell wrote:
> > Hi Tony, Tomi,
> > 
> > On Thu, 12 Nov 2009 10:14:57 -0800 Tony Lindgren <to...@at...> wrote:
> > >
> > > OK. The only dependency is the the move of the headers.
> > > 
> > > Tomi, can you please rebase your patches on top of the "7xx-iosplit-plat-merge"
> > > branch in linux-omap tree? This is commit 8171d88089ad63fc442b2bf32af7c18653adc5cb,
> > > and it should stay static.
> > 
> > OK, *if* you (Tony) guarantee that the base is stable (i.e. never
> > rebased, but may have things added to it) and in linux-next, then I can
> > take the DSS2 stuff separately if you want me to.

Thanks. Yes, there should not be any need to rebase that commit.

> > Tomi, you can, of course, merge that branch into your tree instead of
> > rebasing on top of it (which ever is easiest).
> 
> I rebased DSS2 on top of 8171d88089ad63fc442b2bf32af7c18653adc5cb. It
> can be found from git://gitorious.org/linux-omap-dss2/linux.git for-next
> branch.
> 
> I'm ok with Tony pulling DSS2 to his next-branch, or Stephen pulling
> directly, which ever works easier for you.

I'd rather see Stephen pulling directly from Tomi, that's a good long
term solution for maintaining the DSS2 code.

Regards,

Tony

Re: [Linux-fbdev-devel] [PATCH 00/19] OMAP: DSS2 v5 intro

[Stephen R. <sf...@ca...>]

Tomi,

On Fri, 13 Nov 2009 09:59:28 -0800 Tony Lindgren <to...@at...> wrote:
>
> > I rebased DSS2 on top of 8171d88089ad63fc442b2bf32af7c18653adc5cb. It
> > can be found from git://gitorious.org/linux-omap-dss2/linux.git for-next
> > branch.
> > 
> > I'm ok with Tony pulling DSS2 to his next-branch, or Stephen pulling
> > directly, which ever works easier for you.
> 
> I'd rather see Stephen pulling directly from Tomi, that's a good long
> term solution for maintaining the DSS2 code.

OK, I have added that branch to linux-next from today.  Thanks for all
the efforts.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
	Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sf...@ca...

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.