Hi list, I've read some critical news [0] about mesa and I want to fix the issue asap.
I wanted to cherry pick the following commit to the stable branch 8.0: commit b4082f492b4b55df4c636445e47b97d1f1e4b5b2 Author: Alex Deucher <alexander.deuc...@amd.com> Date: Tue Mar 20 19:43:59 2012 -0400 r600g: add support for TN (trinity) APUs Note: this is a candidate for the stable branches. Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> but it has triggered a non-trivial conflict. At first sight the conflict is caused by the cache flushing rework from commit 0813e58a3e41faf6f2072d034dfdc6198a3a1fee Could someone who is more familiar with the code solve the conflict so that the next stable release (mesa 8.0.5) has support for trinity. [0] http://www.h-online.com/open/features/Kernel-Comment-Release-early-release-often-1696535.html Andreas P.S: I'm cherry-picking all the other outstanding candidates to mesa 8.0 and once I have my fdo account I'll push a branch at people.fdo with all the candidates (about 37) for 8.0. This way the qa's and other people can test a little bit before I push it to the official 8.0 branch. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev