[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: make dev_priv usage explitic in some macros

[Patchwork]

== Series Details ==

Series: drm/i915: make dev_priv usage explitic in some macros
URL   : https://patchwork.freedesktop.org/series/113555/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/113555/revisions/1/mbox/ not applied
Applying: drm/i915: make dev_priv usage explitic in some macros
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/display/intel_display_power.c
M	drivers/gpu/drm/i915/display/intel_dvo.c
M	drivers/gpu/drm/i915/display/intel_pps.c
M	drivers/gpu/drm/i915/display/vlv_dsi.c
M	drivers/gpu/drm/i915/display/vlv_dsi_pll.c
M	drivers/gpu/drm/i915/i915_reg.h
M	drivers/gpu/drm/i915/intel_gvt_mmio_table.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_gvt_mmio_table.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/display/vlv_dsi_pll.c
Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c
Auto-merging drivers/gpu/drm/i915/display/intel_pps.c
Auto-merging drivers/gpu/drm/i915/display/intel_dvo.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.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 drm/i915: make dev_priv usage explitic in some macros
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".