[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091112181457.GX24837@atomide.com>
Date: Thu, 12 Nov 2009 10:14:57 -0800
From: Tony Lindgren <tony@...mide.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Tomi Valkeinen <tomi.valkeinen@...ia.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>,
"linux-fbdev-devel@...ts.sourceforge.net"
<linux-fbdev-devel@...ts.sourceforge.net>,
"dedekind1@...il.com" <dedekind1@...il.com>
Subject: Re: [PATCH 00/19] OMAP: DSS2 v5 intro
* Stephen Rothwell <sfr@...b.auug.org.au> [091111 21:10]:
> Hi Tony,
>
> On Wed, 11 Nov 2009 10:42:09 -0800 Tony Lindgren <tony@...mide.com> wrote:
> >
> > * Tomi Valkeinen <tomi.valkeinen@...ia.com> [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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists