From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Ceraolo Spurio, Daniele" <daniele.ceraolospurio@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: GSC FW support for MTL
Date: Fri, 05 May 2023 21:02:19 -0000 [thread overview]
Message-ID: <168332053950.5020.2528596707502433056@emeril.freedesktop.org> (raw)
In-Reply-To: <20230505160415.889525-1-daniele.ceraolospurio@intel.com>
== Series Details ==
Series: drm/i915: GSC FW support for MTL
URL : https://patchwork.freedesktop.org/series/117396/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/117396/revisions/1/mbox/ not applied
Applying: DO NOT REVIEW: drm/i915: HuC loading and authentication for MTL
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_uc_fw.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 DO NOT REVIEW: drm/i915: HuC loading and authentication for MTL
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
prev parent reply other threads:[~2023-05-05 21:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-05 16:04 [PATCH 0/6] drm/i915: GSC FW support for MTL Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-05 16:04 ` [PATCH 1/6] DO NOT REVIEW: drm/i915: HuC loading and authentication " Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-05 16:04 ` [PATCH 2/6] drm/i915/uc/gsc: fixes and updates for GSC memory allocation Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-23 0:13 ` Teres Alexis, Alan Previn
2023-05-23 0:13 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-23 15:21 ` Ceraolo Spurio, Daniele
2023-05-23 15:21 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-06-06 0:00 ` Teres Alexis, Alan Previn
2023-06-06 0:00 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-05 16:04 ` [PATCH 3/6] drm/i915/uc/gsc: extract release and security versions from the gsc binary Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-25 5:14 ` Teres Alexis, Alan Previn
2023-05-25 5:14 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-25 16:56 ` Ceraolo Spurio, Daniele
2023-05-25 16:56 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-05-25 22:03 ` Teres Alexis, Alan Previn
2023-05-25 22:03 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-27 1:27 ` Ceraolo Spurio, Daniele
2023-05-27 1:27 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-06-05 23:51 ` Teres Alexis, Alan Previn
2023-06-05 23:51 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-05 16:04 ` [PATCH 4/6] drm/i915/uc/gsc: query the GSC FW for its compatibility version Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-25 23:29 ` Teres Alexis, Alan Previn
2023-05-25 23:29 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-05-05 16:04 ` [PATCH 5/6] drm/i915/uc/gsc: define gsc fw Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-25 23:48 ` Teres Alexis, Alan Previn
2023-05-25 23:48 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-06-01 0:32 ` Ceraolo Spurio, Daniele
2023-06-01 0:32 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-05-05 16:04 ` [PATCH 6/6] drm/i915/uc/gsc: Add a gsc_info debugfs Daniele Ceraolo Spurio
2023-05-05 16:04 ` [Intel-gfx] " Daniele Ceraolo Spurio
2023-05-26 22:57 ` Teres Alexis, Alan Previn
2023-05-26 22:57 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-06-01 0:25 ` Ceraolo Spurio, Daniele
2023-06-01 0:25 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-06-05 23:46 ` Teres Alexis, Alan Previn
2023-06-05 23:46 ` [Intel-gfx] " Teres Alexis, Alan Previn
2023-06-05 23:53 ` Ceraolo Spurio, Daniele
2023-06-05 23:53 ` [Intel-gfx] " Ceraolo Spurio, Daniele
2023-05-05 21:02 ` Patchwork [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=168332053950.5020.2528596707502433056@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=daniele.ceraolospurio@intel.com \
--cc=intel-gfx@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.