[igt-dev] ✗ Fi.CI.BUILD: failure for Enable Xe KUnit tests and fix a warning (rev2)

[Patchwork]

== Series Details ==

Series: Enable Xe KUnit tests and fix a warning (rev2)
URL   : https://patchwork.freedesktop.org/series/119378/
State : failure

== Summary ==

Applying: lib/igt_kmod: fill skip message for KUnit skips
Using index info to reconstruct a base tree...
M	lib/igt_kmod.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: intel-ci: add Xe live KUnit tests to BAT testlist
Using index info to reconstruct a base tree...
M	tests/intel-ci/xe-fast-feedback.testlist
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe-fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist
Patch failed at 0002 intel-ci: add Xe live KUnit tests to BAT testlist
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".