[igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_hdr: Fix bpc-switch tests on AMD hardware (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Wed Mar 10 16:45:21 UTC 2021
== 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".
More information about the igt-dev
mailing list