From: Patchwork <patchwork@emeril.freedesktop.org>
To: Jeremy Cline <jcline@redhat.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_hdr: Fix bpc-switch tests on AMD hardware (rev3)
Date: Wed, 10 Mar 2021 16:45:21 -0000 [thread overview]
Message-ID: <161539472158.2308.9500385517901819221@emeril.freedesktop.org> (raw)
In-Reply-To: <20210219172738.263820-1-jcline@redhat.com>
== Series Details ==
Series: tests/kms_hdr: Fix bpc-switch tests on AMD hardware (rev3)
URL : https://patchwork.freedesktop.org/series/87232/
State : failure
== Summary ==
Applying: tests/kms_hdr: Fix bpc-switch tests on AMD hardware
Applying: kms_hdr: Fix bpc-switch tests on AMD hardware
Using index info to reconstruct a base tree...
M tests/kms_hdr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_hdr.c
CONFLICT (content): Merge conflict in tests/kms_hdr.c
Patch failed at 0002 kms_hdr: Fix bpc-switch tests on AMD hardware
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".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-03-10 16:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 17:27 [igt-dev] [PATCH i-g-t] tests/kms_hdr: Fix bpc-switch tests on AMD hardware Jeremy Cline
2021-02-19 18:27 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2021-02-19 19:35 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-02-19 22:00 ` Jeremy Cline
2021-03-05 16:42 ` [igt-dev] [PATCH i-g-t v2 0/2] Fix up the HDR tests for AMD devices Jeremy Cline
2021-03-05 16:42 ` [igt-dev] [PATCH i-g-t v2 1/2] kms_hdr: Skip HDR tests on pre-Kaby Lake Intel devices Jeremy Cline
2021-03-08 8:47 ` Petri Latvala
2021-03-08 12:41 ` Sharma, Swati2
2021-03-08 12:53 ` Petri Latvala
2021-03-08 15:06 ` Jeremy Cline
2021-03-09 14:01 ` Petri Latvala
2021-03-10 12:48 ` Shankar, Uma
2021-03-10 12:53 ` Petri Latvala
2021-03-10 14:55 ` Sharma, Swati2
2021-03-05 16:42 ` [igt-dev] [PATCH i-g-t v2 2/2] kms_hdr: Fix bpc-switch tests on AMD hardware Jeremy Cline
2021-03-05 16:48 ` Kazlauskas, Nicholas
2021-03-05 17:17 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_hdr: Fix bpc-switch tests on AMD hardware (rev2) Patchwork
2021-03-05 21:42 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2021-03-10 16:34 ` [igt-dev] [PATCH i-g-t v3] tests/kms_hdr: Fix bpc-switch tests on AMD hardware Jeremy Cline
2021-03-10 16:38 ` Shankar, Uma
2021-03-10 16:45 ` Patchwork [this message]
2021-03-11 9:01 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_hdr: Fix bpc-switch tests on AMD hardware (rev3) Petri Latvala
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=161539472158.2308.9500385517901819221@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=jcline@redhat.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.