From: Jani Nikula <jani.nikula@intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
"Sarvela, Tomi P" <tomi.p.sarvela@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [RESEND,1/3] drm/i915/dmc: abstract GPU error state dump
Date: Wed, 30 Mar 2022 18:22:18 +0300 [thread overview]
Message-ID: <87o81nbh3p.fsf@intel.com> (raw)
In-Reply-To: <164864512219.8653.2654209743690297581@emeril.freedesktop.org>
On Wed, 30 Mar 2022, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: series starting with [RESEND,1/3] drm/i915/dmc: abstract GPU error state dump
> URL : https://patchwork.freedesktop.org/series/101957/
> State : failure
I don't get why this doesn't apply.
It applies for me.
BR,
Jani.
>
> == Summary ==
>
> Applying: drm/i915/dmc: abstract GPU error state dump
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/display/intel_dmc.c
> M drivers/gpu/drm/i915/display/intel_dmc.h
> M drivers/gpu/drm/i915/i915_gpu_error.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
> Auto-merging drivers/gpu/drm/i915/display/intel_dmc.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.h
> Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.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/i915/dmc: abstract GPU error state dump
> 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".
>
>
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2022-03-30 15:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 12:41 [Intel-gfx] [RESEND 1/3] drm/i915/dmc: abstract GPU error state dump Jani Nikula
2022-03-30 12:41 ` [Intel-gfx] [RESEND 2/3] drm/i915/dmc: hide DMC version macros Jani Nikula
2022-03-30 12:41 ` [Intel-gfx] [RESEND 3/3] drm/i915/dmc: split out dmc registers to a separate file Jani Nikula
2022-03-30 12:58 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [RESEND,1/3] drm/i915/dmc: abstract GPU error state dump Patchwork
2022-03-30 15:22 ` Jani Nikula [this message]
2022-03-31 8:28 ` Sarvela, Tomi P
2022-03-31 8:35 ` Lucas De Marchi
2022-03-31 8:41 ` Sarvela, Tomi P
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=87o81nbh3p.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patchwork@emeril.freedesktop.org \
--cc=tomi.p.sarvela@intel.com \
/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