✗ Ro.CI.BAT: failure for series starting with [01/31] drm: Export drm_dev_init() for subclassing

Patchwork patchwork at emeril.freedesktop.org
Fri Jun 3 12:50:07 UTC 2016


== Series Details ==

Series: series starting with [01/31] drm: Export drm_dev_init() for subclassing
URL   : https://patchwork.freedesktop.org/series/7957/
State : failure

== Summary ==

Applying: drm: Export drm_dev_init() for subclassing
Applying: drm: Add a callback from connector registering
Applying: drm: Make drm_connector_register() safe against multiple calls
Applying: drm: Automatically unregister the connector during cleanup
Applying: drm: Minimally initialise drm_dp_aux
Applying: drm/i915: Perform async fbdev initialisation much later
Applying: drm/i915: Make panel/backlight safe to setup/cleanup multiple times
Applying: drm/i915: Move panel's pipe from backlight setup to init
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_dsi.c
M	drivers/gpu/drm/i915/intel_dvo.c
M	drivers/gpu/drm/i915/intel_lvds.c
M	drivers/gpu/drm/i915/intel_panel.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_panel.c
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/intel_dvo.c
Auto-merging drivers/gpu/drm/i915/intel_dsi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dsi.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
error: Failed to merge in the changes.
Patch failed at 0008 drm/i915: Move panel's pipe from backlight setup to init
The copy of the patch that failed is found in: .git/rebase-apply/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