[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix typo in comments and Kconfig.debug

[Patchwork]

== Series Details ==

Series: drm/i915: Fix typo in comments and Kconfig.debug
URL   : https://patchwork.freedesktop.org/series/93239/
State : failure

== Summary ==

Applying: drm/i915: Fix typo in comments and Kconfig.debug
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Kconfig.debug
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gpu_error.c
M	drivers/gpu/drm/i915/i915_pci.c
M	drivers/gpu/drm/i915/i915_perf.c
M	drivers/gpu/drm/i915/i915_pmu.h
M	drivers/gpu/drm/i915/i915_reg.h
M	drivers/gpu/drm/i915/i915_request.c
M	drivers/gpu/drm/i915/i915_vma.c
M	drivers/gpu/drm/i915/intel_pm.c
M	drivers/gpu/drm/i915/intel_region_ttm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_region_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_region_ttm.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/i915_request.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_pmu.h
Auto-merging drivers/gpu/drm/i915/i915_perf.c
Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/Kconfig.debug
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/i915: Fix typo in comments and Kconfig.debug
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".