[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/4] drm/i915: use a substruct in vbt data for edp

[Patchwork]

== Series Details ==

Series: series starting with [1/4] drm/i915: use a substruct in vbt data for edp
URL   : https://patchwork.freedesktop.org/series/4868/
State : failure

== Summary ==

Series 4868v1 Series without cover letter
2016-03-29T11:58:48.726972 http://patchwork.freedesktop.org/api/1.0/series/4868/revisions/1/mbox/
Applying: drm/i915: use a substruct in vbt data for edp
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/intel_bios.c
M	drivers/gpu/drm/i915/intel_ddi.c
M	drivers/gpu/drm/i915/intel_dp.c
M	drivers/gpu/drm/i915/intel_lvds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_bios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_bios.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Patch failed at 0001 drm/i915: use a substruct in vbt data for edp