✗ Fi.CI.BAT: failure for series starting with [v10,01/40] drm/i915: Gathering the HDCP1.4 routines together

Patchwork patchwork at emeril.freedesktop.org
Thu Jan 10 16:38:50 UTC 2019


== Series Details ==

Series: series starting with [v10,01/40] drm/i915: Gathering the HDCP1.4 routines together
URL   : https://patchwork.freedesktop.org/series/54992/
State : failure

== Summary ==

Applying: drm: header for i915 - MEI_HDCP interface
Applying: component: alloc component_match without any comp to match
Applying: drm/i915: component master at i915 driver load
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
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
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Applying: drm/i915: Initialize HDCP2.2
Applying: drm/i915: MEI interface definition
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
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
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Applying: drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_dp.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
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Patch failed at 0006 drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking
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-trybot mailing list