[Intel-gfx] ✗ Fi.CI.BUILD: failure for Sync i915_pciids upto 8717c6b7414f (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Fri Apr 17 15:15:21 UTC 2020
== Series Details ==
Series: Sync i915_pciids upto 8717c6b7414f (rev2)
URL : https://patchwork.freedesktop.org/series/76080/
State : failure
== Summary ==
Applying: Sync i915_pciids upto 8717c6b7414f
Using index info to reconstruct a base tree...
A src/i915_pciids.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/i915_pciids.h
CONFLICT (content): Merge conflict in include/drm/i915_pciids.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 Sync i915_pciids upto 8717c6b7414f
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