Re: HR timers

[Philip Balister]

Dirk Behme wrote:

So, that code
has diverged from the DaVinci git in lots of ways to be cleanly
re-organized, reformatted etc. for mainline acceptance.  The result, the
merge will take some time.

What's about this merge plan:

1) Take a local branch of recent DaVinci git

3) (Manually) merge (2) on top to (1)

4) Resolve compile and runtime errors introduced by (3)

2) Take a local branch of recent Tonys OMAP git. Should contain mainline DaVinci stuff (?) 3a) With merge conflicts in DaVinci only files, take the files from Tony/mainline. Discard version in DaVinci git. 3b) With merge conflicts in non-DaVinci files, resolve them manually as appropriate 5) Create a patch of the changes between (1) and (after 4) and send to list for review

Philip

Has anyone thought about what it would take to move the davinci specific bits into the OMAP tree?

smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source