[igt-dev] ✗ Fi.CI.BUILD: failure for Introduce KUnit (rev8)

[Patchwork]

== Series Details ==

Series: Introduce KUnit (rev8)
URL   : https://patchwork.freedesktop.org/series/114612/
State : failure

== Summary ==

Applying: lib/igt_kmod: rename kselftest functions to ktest
Using index info to reconstruct a base tree...
M	lib/igt_kmod.c
M	lib/igt_kmod.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kmod.h
Auto-merging lib/igt_kmod.c
No changes -- Patch already applied.
Applying: lib/igt_kmod.c: check if module is builtin before attempting to unload it
Using index info to reconstruct a base tree...
M	lib/igt_kmod.c
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kmod.c
No changes -- Patch already applied.
Applying: lib/igt_kmod: add compatibility for KUnit
Using index info to reconstruct a base tree...
M	lib/igt_kmod.c
M	lib/igt_kmod.h
M	lib/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in lib/igt_ktap.h
Auto-merging lib/igt_ktap.h
CONFLICT (add/add): Merge conflict in lib/igt_ktap.c
Auto-merging lib/igt_ktap.c
Auto-merging lib/igt_kmod.h
CONFLICT (content): Merge conflict in lib/igt_kmod.h
Auto-merging lib/igt_kmod.c
CONFLICT (content): Merge conflict in lib/igt_kmod.c
Patch failed at 0003 lib/igt_kmod: add compatibility for KUnit
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".