Hi Tony, On 2013-04-03 18:46, Tony Lindgren wrote:
>> Tony, I've split these patches as follows: >> >> Platform data header file changes: >> git://gitorious.org/linux-omap-dss2/linux.git 3.10/0-dss-headers >> >> Board file changes (based on header changes): >> git://gitorious.org/linux-omap-dss2/linux.git 3.10-lo/board-cleanup >> >> DSS panel changes (based on header changes): >> git://gitorious.org/linux-omap-dss2/linux.git 3.10/1-panel-cleanup >> >> Removing unused fields from header files (based on panel changes): >> git://gitorious.org/linux-omap-dss2/linux.git 3.10/2-late-panel-cleanup >> >> The 2-late-panel-cleanup breaks compilation if the arch changes are not >> merged, so I'll leave that until they have been merged. >> >> Do you mind if I add the board-cleanup branch temporarily to omapdss's >> for-next, to simplify testing? When everything looks ok, I'll remove it >> and pass the branch to you to be handled through l-o. > > Sure please go ahead. There are still some board-*.c related patches > that I have not merged, but we'll see those merge conflicts before > next as I usually do a merge with next before sending out pull reqs. The code seems to work ok, so I think we can declare the branches stable. I've pushed new for-next branch that does not contain the arch files anymore. In fact, I removed all omapdss patches also, as omapdss should be merged through the drm tree, and I don't want to have conflicts with drm's for-next branch. So, to recap, the common header changes are located in: git://gitorious.org/linux-omap-dss2/linux.git 3.10/0-dss-headers And the branch for linux-omap is: git://gitorious.org/linux-omap-dss2/linux.git 3.10-lo/board-cleanup After merging those, some displays won't start anymore until the omapdss changes are in, but things should still compile. Tomi
signature.asc
Description: OpenPGP digital signature
