== Series Details == Series: drm/i915: Use helpers for drm_mm_node booleans URL : https://patchwork.freedesktop.org/series/67602/ State : failure == Summary == Applying: drm/i915: Use helpers for drm_mm_node booleans Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c M drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_gem_evict.c M drivers/gpu/drm/i915/i915_vma.c M drivers/gpu/drm/i915/i915_vma.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_vma.h Auto-merging drivers/gpu/drm/i915/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c Auto-merging drivers/gpu/drm/i915/i915_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: Use helpers for drm_mm_node booleans 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
