From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/3] lib/igt_sysfs: Add helpers to iterate over GTs (rev2)
Date: Wed, 20 Apr 2022 05:59:31 -0000 [thread overview]
Message-ID: <165043437152.24580.4399884329121076247@emeril.freedesktop.org> (raw)
In-Reply-To: <deb07be64c3930945a0e7bd17989fda4ed2e5ece.1649870633.git.ashutosh.dixit@intel.com>
== Series Details ==
Series: series starting with [i-g-t,1/3] lib/igt_sysfs: Add helpers to iterate over GTs (rev2)
URL : https://patchwork.freedesktop.org/series/102664/
State : failure
== Summary ==
Applying: lib/igt_sysfs: Add helpers to iterate over GTs
Applying: tests/i915_pm_disag_freq: New test for media freq factor
Applying: tests/i915_pm_disag_freq: New test for media freq factor
Using index info to reconstruct a base tree...
M tests/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tests/i915/i915_pm_disag_freq.c
Auto-merging tests/i915/i915_pm_disag_freq.c
Patch failed at 0003 tests/i915_pm_disag_freq: New test for media freq factor
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".
prev parent reply other threads:[~2022-04-20 5:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 17:27 [igt-dev] [PATCH i-g-t 1/2] lib/igt_sysfs: Add helpers to iterate over gts Ashutosh Dixit
2022-04-13 17:27 ` [igt-dev] [PATCH i-g-t 2/2] tests/i915_pm_disag_freq: New test for media freq factor Ashutosh Dixit
2022-04-14 15:40 ` Kamil Konieczny
2022-04-20 5:07 ` Dixit, Ashutosh
2022-04-13 17:46 ` [igt-dev] ✗ GitLab.Pipeline: warning for series starting with [i-g-t,1/2] lib/igt_sysfs: Add helpers to iterate over gts Patchwork
2022-04-13 18:10 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2022-04-13 20:09 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2022-04-14 15:18 ` [igt-dev] [PATCH i-g-t 1/2] " Kamil Konieczny
2022-04-20 5:05 ` Dixit, Ashutosh
2022-04-20 5:02 ` [igt-dev] [PATCH i-g-t 1/3] lib/igt_sysfs: Add helpers to iterate over GTs Ashutosh Dixit
2022-04-20 5:02 ` [igt-dev] [PATCH i-g-t 2/3] lib/igt_sysfs: Add RPS sysfs helpers Ashutosh Dixit
2022-04-20 5:02 ` [igt-dev] [PATCH i-g-t 3/3] tests/i915_pm_disag_freq: New test for media freq factor Ashutosh Dixit
2022-04-20 5:59 ` 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=165043437152.24580.4399884329121076247@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=ashutosh.dixit@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.