[Intel-gfx] ✗ Fi.CI.BUILD: failure for Splitting up platform-specific calls (rev2)

Patchwork patchwork at emeril.freedesktop.org
Fri Feb 11 02:20:08 UTC 2022

== Series Details ==

Series: Splitting up platform-specific calls (rev2)
URL   : https://patchwork.freedesktop.org/series/99126/
State : failure

== Summary ==

Applying: i915/drm: Split out x86 and arm64 functionality
.git/rebase-apply/patch:64: new blank line at EOF.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
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/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 i915/drm: Split out x86 and arm64 functionality
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