Hi, I tried to merge the drm-next branch from https://gitlab.freedesktop.org/drm/kernel.git into the mainline kernel by using $ git merge <drm-next branch> but I got several conflicts, so I aborted the merge.
In general, given that conflicts only appear in drm code, is using $ git merge -X theirs <drm-next branch> the correct way to resolve these merge conflicts when drm-next is merged into the mainline kernel? Or is there no general conflict resolution strategy, which means that each conflict has to be dealt with carefully? Regards, Viktor
