== Series Details == Series: drm: Enable buddy allocator support URL : https://patchwork.freedesktop.org/series/96054/ State : failure == Summary == Applying: drm: Move and rename i915 buddy header Applying: drm: Move and rename i915 buddy source Applying: drm: add Makefile support for drm buddy Using index info to reconstruct a base tree... M drivers/gpu/drm/Makefile M drivers/gpu/drm/drm_drv.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_drv.c Auto-merging drivers/gpu/drm/Makefile 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: add Makefile support for drm buddy 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".
