DSS2 questions

[Gary Thomas <gary@mlbassoc.com>]

Tomi,

I've been following your DSS2 work, with reasonable success.
However, when I tried to pull from your repo today, I got
a ton of merge errors.  I cloned your tree a [little] while
back (it seems it was 2009-06-16, but where did the time go?)

Here's what I did:
  git clone http://www.bat.org/~tomba/git/linux-omap-dss.git
    HEAD=5bd374f9b199d46ae434489d56615b240de5a6d7
  git checkout -b my_branch origin/master
    ...
When I went to pull into my_branch, I got the merge errors.
Any clues what I did wrong?  How could/should I have managed
this better?

n.b. you earlier told me that git was better than sliced
bread; I'm still waiting to be shown the light :-)

Second question; I've set up my system much the same as the
boards you are working on, with an LCD and TV outputs.  I'm
a bit confused as to how I configure the overlays and managers
to be able to send YUV data directly through to either the
LCD or TV.  Can you explain this?

Thanks

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------