[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/4] drm/i915/runtime_pm: Share code to enable/disable PCH reset handshake
Patchwork
patchwork at emeril.freedesktop.org
Thu Sep 13 22:30:45 UTC 2018
== Series Details ==
Series: series starting with [1/4] drm/i915/runtime_pm: Share code to enable/disable PCH reset handshake
URL : https://patchwork.freedesktop.org/series/49671/
State : failure
== Summary ==
Applying: drm/i915/runtime_pm: Share code to enable/disable PCH reset handshake
Applying: drm/i915: Unset reset pch handshake when PCH is not present in one place
Applying: drm/i915: Do not modifiy reserved bit in gens that do not have IPC
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
error: Failed to merge in the changes.
Patch failed at 0003 drm/i915: Do not modifiy reserved bit in gens that do not have IPC
Use 'git am --show-current-patch' to see the failed patch
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