== Series Details == Series: series starting with [v2,1/7] drm/selftests: Move i915 buddy selftests into drm (rev2) URL : https://patchwork.freedesktop.org/series/100598/ State : failure == Summary == Applying: drm/selftests: Move i915 buddy selftests into drm Using index info to reconstruct a base tree... M drivers/gpu/drm/Kconfig M drivers/gpu/drm/selftests/Makefile Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in drivers/gpu/drm/selftests/test-drm_buddy.c Auto-merging drivers/gpu/drm/selftests/test-drm_buddy.c CONFLICT (add/add): Merge conflict in drivers/gpu/drm/selftests/drm_buddy_selftests.h Auto-merging drivers/gpu/drm/selftests/drm_buddy_selftests.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/selftests: Move i915 buddy selftests into drm When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
