[igt-dev] ✗ Fi.CI.BAT: failure for Modify tests for unavailable mappable aperture (rev6)

Patchwork
2019-02-25T18:37:04Z

== Series Details ==

Series: Modify tests for unavailable mappable aperture (rev6)
URL : https://patchwork.freedesktop.org/series/57042/
State : failure

== Summary ==

Applying: tests/prime_self_import: Swap gtt mapping for cpu
Using index info to reconstruct a base tree...
M tests/prime_self_import.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/i915/gem_mmap_wc: Add local MMAP wrapper
Applying: igt/lib: Add wrapper to check if gtt mapping is available
Using index info to reconstruct a base tree...
M lib/ioctl_wrappers.c
M lib/ioctl_wrappers.h
Falling back to patching base and 3-way merge...
Auto-merging lib/ioctl_wrappers.h
Auto-merging lib/ioctl_wrappers.c
CONFLICT (content): Merge conflict in lib/ioctl_wrappers.c
Patch failed at 0003 igt/lib: Add wrapper to check if gtt mapping is available
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".