== Series Details == Series: Update to GuC version 69.0.3 URL : https://patchwork.freedesktop.org/series/98249/ State : failure == Summary == Applying: drm/i915/guc: Temporarily bump the GuC load timeout Applying: drm/i915/guc: Update to GuC version 69.0.3 Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/uc/intel_guc_log.h M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_log.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_log.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915/guc: Update to GuC version 69.0.3 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".
