[Intel-gfx] ✗ Fi.CI.BAT: failure for gcc-plugins: Introduce stackinit plugin

[Jani Nikula]

On Wed, 23 Jan 2019, Patchwork <patchwork at emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: gcc-plugins: Introduce stackinit plugin
> URL   : https://patchwork.freedesktop.org/series/55630/
> State : failure
>
> == Summary ==
>
> Applying: treewide: Lift switch variables out of switches
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/drm_edid.c
> M	drivers/gpu/drm/i915/intel_display.c
> M	drivers/gpu/drm/i915/intel_pm.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_pm.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_display.c
> Auto-merging drivers/gpu/drm/drm_edid.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 treewide: Lift switch variables out of switches
> 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".

This obviously fails because the patch is against upstream rather than
our development tree. No worries.

BR,
Jani.


>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center