[Intel-gfx] ✗ Fi.CI.BAT: failure for Fixing sink count related detection over (rev8)
Ander Conselvan De Oliveira
conselvan2 at gmail.com
Tue Jan 19 01:38:41 PST 2016
On Mon, 2016-01-18 at 13:01 +0000, Patchwork wrote:
> == Summary ==
> HEAD is now at 2dd73be drm-intel-nightly: 2016y-01m-18d-09h-59m-27s UTC
> integration manifest
> Applying: drm/i915: Splitting intel_dp_detect
> Applying: drm/i915: Cleaning up intel_dp_hpd_pulse
> Applying: drm/i915: Splitting intel_dp_check_link_status
> Applying: drm/i915: Save sink_count for tracking changes to it
> Applying: drm/i915: Save sink_count for tracking changes to it and read
> sink_count dpcd always
It seems patchwork got confused about the order of the new patches in this
series. When you change multiple patches at once, it is common to resend the
entire series without --in-reply-to. It makes it easier for humans and patchwork
to figure out which are the new patches.
Can you please resend the series as a new thread so we can have the patches go
through CI run?
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/intel_dp.c
> M drivers/gpu/drm/i915/intel_drv.h
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_dp.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
> Patch failed at 0005 drm/i915: Save sink_count for tracking changes to it and
> read sink_count dpcd always
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
More information about the Intel-gfx