[igt-dev] ✗ Fi.CI.BUILD: failure for Introduced partial FreeBSD compatibility (rev5)
Patchwork
patchwork at emeril.freedesktop.org
Wed Sep 28 19:43:20 UTC 2022
== Series Details ==
Series: Introduced partial FreeBSD compatibility (rev5)
URL : https://patchwork.freedesktop.org/series/108081/
State : failure
== Summary ==
Applying: Introduced partial FreeBSD compatibility
Using index info to reconstruct a base tree...
M lib/i915/intel_memory_region.c
M tests/i915/gem_mmap_offset.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_mmap_offset.c
CONFLICT (content): Merge conflict in tests/i915/gem_mmap_offset.c
Auto-merging lib/i915/intel_memory_region.c
Patch failed at 0001 Introduced partial FreeBSD compatibility
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