[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix Kconfig indentation

[Jani Nikula]

On Mon, 07 Oct 2019, Patchwork <patchwork at emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915: Fix Kconfig indentation
> URL   : https://patchwork.freedesktop.org/series/67707/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Fix Kconfig indentation
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/Kconfig.debug
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/Kconfig.debug
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 drm/i915: Fix Kconfig indentation
> 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 conflict is due to a CI-only commit in drm-tip that's not headed
for upstream. Eyeballed the patch, git show -w indicates no changes, so
applied to drm-intel-next-queued. Thanks for the patch.

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