From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6)
Date: Thu, 06 Apr 2023 14:44:59 -0000 [thread overview]
Message-ID: <168079229983.9550.3598269932155038055@emeril.freedesktop.org> (raw)
In-Reply-To: <20230406141538.3414368-1-tvrtko.ursulin@linux.intel.com>
== Series Details ==
Series: Vendor agnostic gputop (rev6)
URL : https://patchwork.freedesktop.org/series/102175/
State : failure
== Summary ==
Applying: lib: Extract igt_drm_clients from intel_gpu_top
Applying: lib: Allow specifying custom engine map
Using index info to reconstruct a base tree...
M lib/igt_drm_fdinfo.c
M tests/i915/drm_fdinfo.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/drm_fdinfo.c
Auto-merging lib/igt_drm_fdinfo.c
CONFLICT (content): Merge conflict in lib/igt_drm_fdinfo.c
Patch failed at 0002 lib: Allow specifying custom engine map
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".
next prev parent reply other threads:[~2023-04-06 14:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 14:15 [Intel-gfx] [PATCH i-g-t v4 0/8] Vendor agnostic gputop Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 1/8] lib: Extract igt_drm_clients from intel_gpu_top Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 2/8] lib: Allow specifying custom engine map Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 3/8] lib/igt_drm_clients: Record client drm minor Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 4/8] lib/igt_drm_clients: Support multiple DRM cards Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 5/8] lib/igt_drm_fdinfo: Track largest engine index Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 6/8] lib/igt_drm_clients: Decouple hardcoded engine assumptions Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 7/8] lib/igt_drm_clients: Enforce client status sort order in the library Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:15 ` [Intel-gfx] [PATCH i-g-t 8/8] gputop: Basic vendor agnostic GPU top tool Tvrtko Ursulin
2023-04-06 14:15 ` [igt-dev] " Tvrtko Ursulin
2023-04-06 14:44 ` Patchwork [this message]
2023-04-06 15:05 ` [igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6) Tvrtko Ursulin
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=168079229983.9550.3598269932155038055@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=tvrtko.ursulin@linux.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 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.