== Series Details == Series: series starting with [v5,1/6] drm: move the buddy allocator from i915 into common drm URL : https://patchwork.freedesktop.org/series/98369/ State : failure == Summary == Applying: drm: move the buddy allocator from i915 into common drm Using index info to reconstruct a base tree... M drivers/gpu/drm/Kconfig M drivers/gpu/drm/Makefile M drivers/gpu/drm/i915/Kconfig M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/i915_module.c M drivers/gpu/drm/i915/i915_scatterlist.c M drivers/gpu/drm/i915/selftests/intel_memory_region.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/intel_memory_region.c Removing drivers/gpu/drm/i915/selftests/i915_buddy.c Auto-merging drivers/gpu/drm/i915/i915_scatterlist.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scatterlist.c Auto-merging drivers/gpu/drm/i915/i915_module.c Removing drivers/gpu/drm/i915/i915_buddy.h Removing drivers/gpu/drm/i915/i915_buddy.c Auto-merging drivers/gpu/drm/i915/Makefile Auto-merging drivers/gpu/drm/i915/Kconfig Auto-merging drivers/gpu/drm/Makefile Auto-merging drivers/gpu/drm/Kconfig 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: move the buddy allocator from i915 into common 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".
