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

Patchwork patchwork at emeril.freedesktop.org
Tue May 31 13:07:37 UTC 2016


== Series Details ==

Series: series starting with [01/21] drm: Export drm_dev_init() for subclassing
URL   : https://patchwork.freedesktop.org/series/7992/
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
Applying: drm/i915: Move intel_connector->unregister to connector->early_unregister
Applying: drm/i915: Move backlight unregistration to connector unregistration
Applying: drm/i915: Move registration actions to connector->late_register
Applying: drm/i915: Move backlight setup to connector registration
Applying: drm/i915: Move backlight registration to connector registration
Applying: drm/i915: Move connector registration to driver registration
Applying: drm/i915: Register debugfs interface last
Applying: drm/i915: Demidlayer driver loading
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Applying: drm/i915: Demidlayer driver unloading
Applying: drm/i915: Start exploiting drm_device subclassing
Applying: drm/i915: Merge i915_dma.c into i915_drv.c
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Removing drivers/gpu/drm/i915/i915_dma.c
Patch failed at 0019 drm/i915: Merge i915_dma.c into i915_drv.c
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