[Intel-gfx] ✗ Fi.CI.BUILD: failure for Initial Meteorlake Support (rev11)
Patchwork
patchwork at emeril.freedesktop.org
Tue Sep 27 01:33:01 UTC 2022
== Series Details ==
Series: Initial Meteorlake Support (rev11)
URL : https://patchwork.freedesktop.org/series/106786/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/106786/revisions/11/mbox/ not applied
Applying: drm/i915: Read graphics/media/display arch version from hw
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_gt_regs.h
M drivers/gpu/drm/i915/i915_driver.c
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pci.c
M drivers/gpu/drm/i915/i915_reg.h
M drivers/gpu/drm/i915/intel_device_info.c
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_driver.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_regs.h
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: Read graphics/media/display arch version from hw
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".
More information about the Intel-gfx
mailing list