[Intel-gfx] ✗ Fi.CI.BAT: failure for Implement HDCP2.2: PART-I (rev2)

Patchwork patchwork at emeril.freedesktop.org
Tue Oct 30 10:27:40 UTC 2018


== Series Details ==

Series: Implement HDCP2.2: PART-I (rev2)
URL   : https://patchwork.freedesktop.org/series/51495/
State : failure

== Summary ==

Applying: drm/i915: wrapping all hdcp var into intel_hdcp
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_drv.h
M	drivers/gpu/drm/i915/intel_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdcp.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: wrapping all hdcp var into intel_hdcp
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".

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10620/issues.html


More information about the Intel-gfx mailing list