== Series Details == Series: series starting with [v2,1/2] drm/buddy: Improve offset-aligned allocation handling URL : https://patchwork.freedesktop.org/series/161256/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/161256/revisions/1/mbox/ not applied Applying: drm/buddy: Improve offset-aligned allocation handling 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 0001 drm/buddy: Improve offset-aligned allocation handling 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". Build failed, no error log produced
