[igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu: add vce decoder test
Patchwork
patchwork at emeril.freedesktop.org
Thu Jul 6 01:36:36 UTC 2023
== Series Details ==
Series: tests/amdgpu: add vce decoder test
URL : https://patchwork.freedesktop.org/series/120258/
State : failure
== Summary ==
Applying: tests/amdgpu: add vce decoder test
Using index info to reconstruct a base tree...
M tests/amdgpu/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/amdgpu/meson.build
CONFLICT (content): Merge conflict in tests/amdgpu/meson.build
Patch failed at 0001 tests/amdgpu: add vce decoder test
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