== Series Details ==

Series: series starting with [1/3] lib: Add stride and size calculation for amdgpu + tiling
URL   : https://patchwork.freedesktop.org/series/85724/
State : failure

== Summary ==

Applying: lib: Add stride and size calculation for amdgpu + tiling
Applying: kms_rotation_crc:Add HW rotation test case for amdgpu
Using index info to reconstruct a base tree...
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
Patch failed at 0002 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".


_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev