Re: Moving board patches from DSS2 to linux-omap

Tony Lindgren
2010-02-12T20:41:42Z

* Tomi Valkeinen <tomi.valkeinen@nokia.com> [100212 02:38]:
> On Thu, 2010-02-11 at 19:52 +0100, ext Tony Lindgren wrote:
> > * Tomi Valkeinen <tomi.valkeinen@nokia.com> [100211 03:59]:
> > > On Thu, 2010-02-11 at 12:50 +0100, ext Mike Rapoport wrote:
> > > > Tomi Valkeinen wrote:
> > > > > Hi,
> > > > >
> > > > > As discussed previously, board file changes in DSS2 tree cause conflicts
> > > > > with linux-omap easily. There are currently three board file patches in
> > > > > DSS2's for-next branch:
> > > > >
> > > > > 722a97e4594b2041bbf18d95a913ba6dfaca87f2 omap3: cm-t35: add DSS2 display support
> > > > > 7a56267e775e469c64521179ccc958c8bb661dbf OMAP: AM3517: Enable DSS2 for AM3517EVM board
> > > > > 40e4e67c6dabcb9897b6823cce2297d6c3e78bbd OMAP: Enable DSS2 for OMAP3EVM board
> > > > >
> > > > > The problem here is of course that DSS2 tree may contain unmerged panel
> > > > > drivers, and those board file changes try to use these new panel
> > > > > drivers.
> >
> > OK, Tomi, can you please set up a banch against mainline -rc7 with
> > whatever board-*.c dss2 patches you want me to pull? I'll pull them
> > into omap-for-linus, and rebase omap for-next on those.
>
> Here:
>
> git://gitorious.org/linux-omap-dss2/linux.git for-tony
>
> I removed the defconfig changes from the patches, and compile tested.
> I'll add the defconfig changes as separate patches in my tree, and I'll
> push them to Linus only after the board changes from Tony's tree have
> gone through.

Great, thanks, I've pulled it into omap-for-linus branch. Note that we
need to wait for Russell to merge the arm changes first and then I
need merge with that before I can send a pull request because of the
addruart changes that affect most of our multi-omap patches.

So you may want to send the defconfig changes as a separate fix later on
if that allows you to keep your dss2 mergeable without having to worry
about the merging of arm and omap trees.

Regards,

Tony