== Series Details == Series: series starting with [1/7] drm/selftests: Move i915 buddy selftests into drm URL : https://patchwork.freedesktop.org/series/99663/ State : failure == Summary == Applying: drm/selftests: Move i915 buddy selftests into drm Applying: drm/selftests: add drm buddy alloc limit testcase Applying: drm/selftests: add drm buddy alloc range testcase Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_buddy.c M include/drm/drm_buddy.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_buddy.h CONFLICT (content): Merge conflict in include/drm/drm_buddy.h Auto-merging drivers/gpu/drm/drm_buddy.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_buddy.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/selftests: add drm buddy alloc range testcase 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".
