From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Jeevan B" <jeevan.b@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for Add FBC support to PSR/PSR2 tests (rev6)
Date: Tue, 28 Nov 2023 14:24:51 -0000 [thread overview]
Message-ID: <170118149167.8221.10564450255673853306@emeril.freedesktop.org> (raw)
In-Reply-To: <20231128113707.2463245-1-jeevan.b@intel.com>
== Series Details ==
Series: Add FBC support to PSR/PSR2 tests (rev6)
URL : https://patchwork.freedesktop.org/series/126689/
State : failure
== Summary ==
Applying: tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
Using index info to reconstruct a base tree...
M tests/intel/kms_psr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr.c
CONFLICT (content): Merge conflict in tests/intel/kms_psr.c
Patch failed at 0001 tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
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:[~2023-11-28 14:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 11:37 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-28 11:37 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-28 11:37 ` [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests Jeevan B
2023-11-28 14:24 ` 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=170118149167.8221.10564450255673853306@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=jeevan.b@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