From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6)
Date: Thu, 6 Apr 2023 16:05:33 +0100 [thread overview]
Message-ID: <890627f2-d4b0-0d1b-c060-c44556b358b1@linux.intel.com> (raw)
In-Reply-To: <168079229983.9550.3598269932155038055@emeril.freedesktop.org>
On 06/04/2023 15:44, Patchwork wrote:
> == 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".
>
commit 31871b929eb219e8be516b5e90337c4143507c26
Author: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
AuthorDate: Wed Apr 5 00:09:08 2023 +0000
Commit: Kamil Konieczny <kamil.konieczny@linux.intel.com>
CommitDate: Thu Apr 6 14:34:44 2023 +0200
lib/drm_fdinfo: Check for compute engines when parsing
Criss-cross.. another rebase.. But I'll wait until there are some reviews.
Regards,
Tvrtko
prev parent reply other threads:[~2023-04-06 15:05 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 ` [igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6) Patchwork
2023-04-06 15:05 ` Tvrtko Ursulin [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=890627f2-d4b0-0d1b-c060-c44556b358b1@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=igt-dev@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.