From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
Arun R Murthy <arun.r.murthy@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BUILD: failure for drm/xe/display: Change HPD to polling on runtime suspend (rev2)
Date: Mon, 12 Aug 2024 10:24:42 +0300 [thread overview]
Message-ID: <878qx22og5.fsf@intel.com> (raw)
In-Reply-To: <172344026092.593417.12138202500002697402@2413ebb6fbb6>
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
prev parent reply other threads:[~2024-08-12 7:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 4:02 [PATCHv3] drm/xe/display: Change HPD to polling on runtime suspend Arun R Murthy
2024-08-12 5:24 ` ✗ Fi.CI.BUILD: failure for drm/xe/display: Change HPD to polling on runtime suspend (rev2) Patchwork
2024-08-12 7:24 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878qx22og5.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=arun.r.murthy@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patchwork@emeril.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox