Re: ✗ Fi.CI.BUILD: failure for drm/xe/display: Change HPD to polling on runtime suspend (rev2)

[Jani Nikula <jani.nikula@linux.intel.com>]

On Mon, 12 Aug 2024, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/xe/display: Change HPD to polling on runtime suspend (rev2)
> URL   : https://patchwork.freedesktop.org/series/137026/
> State : failure
>
> == Summary ==
>
> Error: patch https://patchwork.freedesktop.org/api/1.0/series/137026/revisions/2/mbox/ not applied
> Applying: drm/xe/display: Change HPD to polling on runtime suspend
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/xe/display/xe_display.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/xe/display/xe_display.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0001 drm/xe/display: Change HPD to polling on runtime suspend
> 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".
> Build failed, no error log produced

Please rebase, the last one already failed to apply.

BR,
Jani.


-- 
Jani Nikula, Intel