[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,01/12] i915: Add gem_vm_create (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,01/12] i915: Add gem_vm_create (rev2)
URL   : https://patchwork.freedesktop.org/series/60958/
State : failure

== Summary ==

Applying: i915: Add gem_vm_create
Applying: i915/gem_ctx_param: Test set/get (copy) VM
Applying: i915/gem_ctx_create: Basic checks for constructor properties
Applying: i915: Add gem_ctx_clone
Applying: i915: Exercise creating context with shared GTT
Using index info to reconstruct a base tree...
M	tests/i915/gem_exec_whisper.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_exec_whisper.c
CONFLICT (content): Merge conflict in tests/i915/gem_exec_whisper.c
Patch failed at 0005 i915: Exercise creating context with shared GTT
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".