[Intel-gfx] ✗ Fi.CI.BUILD: failure for i915: Fix uninitialized variable err
Patchwork
patchwork at emeril.freedesktop.org
Mon Mar 29 15:00:58 UTC 2021
== Series Details ==
Series: i915: Fix uninitialized variable err
URL : https://patchwork.freedesktop.org/series/88545/
State : failure
== Summary ==
Applying: i915: Fix uninitialized variable err
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_mm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_mm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_mm.c
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: Fix uninitialized variable err
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