✗ Fi.CI.BUILD: failure for Update image assets (rev8)

Patchwork patchwork at emeril.freedesktop.org
Wed Jul 2 18:09:12 UTC 2025


== Series Details ==

Series: Update image assets (rev8)
URL   : https://patchwork.freedesktop.org/series/141539/
State : failure

== Summary ==

Applying: data: Move PNG images to new data directory
Using index info to reconstruct a base tree...
M	lib/meson.build
M	meson.build
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging meson.build
Auto-merging lib/meson.build
CONFLICT (content): Merge conflict in lib/meson.build
Patch failed at 0001 data: Move PNG images to new data directory
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