✗ Fi.CI.BAT: failure for drm/i915: Implement HDCP2.2

Patchwork patchwork at emeril.freedesktop.org
Tue Sep 25 15:32:32 UTC 2018

== Series Details ==

Series: drm/i915: Implement HDCP2.2
URL   : https://patchwork.freedesktop.org/series/50154/
State : failure

== Summary ==

Applying: drm: hdcp2.2 authentication msg definitions
Applying: drm: HDMI and DP specific HDCP2.2 defines
Applying: linux/mei: Header for mei_hdcp driver interface
Applying: drm/i915: wrapping all hdcp var into intel_hdcp
Applying: drm/i915: Define Intel HDCP2.2 registers
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
M	include/drm/i915_component.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/i915_component.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Patch failed at 0007 drm/i915: component master at i915 driver load
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-trybot mailing list