[igt-dev] ✗ Fi.CI.BUILD: failure for kms_rotation_crc:Add HW rotation test case for amdgpu (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Thu Jan 21 23:08:16 UTC 2021
== Series Details ==
Series: kms_rotation_crc:Add HW rotation test case for amdgpu (rev3)
URL : https://patchwork.freedesktop.org/series/85018/
State : failure
== Summary ==
Applying: kms_rotation_crc:Add HW rotation test case for amdgpu
Using index info to reconstruct a base tree...
M lib/igt_amd.c
M lib/igt_amd.h
M lib/igt_fb.c
M tests/kms_rotation_crc.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_rotation_crc.c
CONFLICT (content): Merge conflict in tests/kms_rotation_crc.c
Auto-merging lib/igt_fb.c
CONFLICT (content): Merge conflict in lib/igt_fb.c
Auto-merging lib/igt_amd.h
CONFLICT (content): Merge conflict in lib/igt_amd.h
Auto-merging lib/igt_amd.c
CONFLICT (content): Merge conflict in lib/igt_amd.c
Patch failed at 0001 kms_rotation_crc:Add HW rotation test case for amdgpu
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