== Series Details == Series: series starting with [CI,1/4] drm/i915/gt: Call intel_gt_sanitize() directly URL : https://patchwork.freedesktop.org/series/68869/ State : failure == Summary == Applying: drm/i915/gt: Call intel_gt_sanitize() directly Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_pm.c M drivers/gpu/drm/i915/gt/intel_gt.c M drivers/gpu/drm/i915/gt/intel_gt.h M drivers/gpu/drm/i915/gt/intel_gt_pm.c M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/selftests/i915_gem.c M drivers/gpu/drm/i915/selftests/mock_gem_device.c M drivers/gpu/drm/i915/selftests/mock_gtt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_pm.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.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/gt: Call intel_gt_sanitize() directly 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
