[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings
URL   : https://patchwork.freedesktop.org/series/47345/
State : failure

== Summary ==

Applying: meson: Fixup gem_mocs_settings
Using index info to reconstruct a base tree...
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
CONFLICT (content): Merge conflict in tests/meson.build
Patch failed at 0001 meson: Fixup gem_mocs_settings
Use 'git am --show-current-patch' to see the failed patch
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".