== Series Details == Series: series starting with [1/9] drm/i915/gt: Show the per-engine runtime in sysfs (rev2) URL : https://patchwork.freedesktop.org/series/86040/ State : failure == Summary == Applying: drm/i915/gt: Show the per-engine runtime in sysfs Applying: drm/i915: Expose list of clients in sysfs Applying: drm/i915: Update client name on context create Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drm_client.c M drivers/gpu/drm/i915/i915_drm_client.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drm_client.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drm_client.h Auto-merging drivers/gpu/drm/i915/i915_drm_client.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drm_client.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/i915: Update client name on context create 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
