I'm following the X.org wiki procedure for building a 2.6.31 + drm-next kernel (http://wiki.x.org/wiki/radeonBuildHo...198d772a55fad3), which is pretty much the same as Neo's here. I am running Fedora 11, GPU is RV730 (Radeon HD 4670) and M/b chipset is ATI 780G.
When I try to pull the drm-next changes from Dave Airlied's tree I get a merge conflict in intel_sdvo.c:-
I think I can get round the conflict by doing "git add <file>" on intel_sdvo.c. Will this matter, as I don't have i915 chipset? If it does, how can I resolve the conflict?
[andrew@localhost linux-2.6.31.y]$ git pull airlied_drm_remote drm-next
remote: Counting objects: 2129, done.
remote: Compressing objects: 100% (776/776), done.
remote: Total 1896 (delta 1428), reused 1538 (delta 1118)
Receiving objects: 100% (1896/1896), 559.58 KiB | 474 KiB/s, done.
Resolving deltas: 100% (1428/1428), completed with 145 local objects.
* branch drm-next -> FETCH_HEAD
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
Automatic merge failed; fix conflicts and then commit the result.