On 2013-04-16 00:20, Tony Lindgren wrote: >> 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. > > Sounds like it's best that you merge those branches via your > tree as the conflicts have been already resolved in linux next.
The dss changes are going through drm tree this time, as there are some drm dependencies also, and I've already sent the pull request for those. And when I asked Dave Airlie if he can merge the dss changes, I didn't talk about a big chunk of arch file changes getting included. Also, the whole division to two independent branches was done only to make it possible for the arch changes to go through l-o tree. There will probably be more these kind of changes in the future, so I think we should agree how to handle those and stick to the plan. Dividing the arch file changes to a separate branch is often quite laborious, and I'd rather not do that for nothing. Tomi
signature.asc
Description: OpenPGP digital signature
