[Intel-gfx] ✗ Fi.CI.BAT: failure for Optimize use of DBuf slices (rev2)

[Rodrigo Vivi]

On Wed, Apr 25, 2018 at 09:46:23PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: Optimize use of DBuf slices (rev2)
> URL   : https://patchwork.freedesktop.org/series/41180/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915/icl: track dbuf slice-2 status
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/i915_drv.h
> M	drivers/gpu/drm/i915/intel_display.c
> M	drivers/gpu/drm/i915/intel_pm.c
> M	drivers/gpu/drm/i915/intel_runtime_pm.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_display.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/icl: track dbuf slice-2 status
> 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".

Mahesh, I'm really sorry for taking so long to review these patches....

Could you please send a rebased version so after CI giving the okay we push it.

Thanks in advance,
Rodrigo.

> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8588/issues.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx