✗ Fi.CI.BUILD: failure for Refactor sriov_basic test and blocklisting (rev2)

[Patchwork]

== Series Details ==

Series: Refactor sriov_basic test and blocklisting (rev2)
URL   : https://patchwork.freedesktop.org/series/135946/
State : failure

== Summary ==

Applying: tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests
Using index info to reconstruct a base tree...
M	tests/intel-ci/xe.blocklist.txt
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe.blocklist.txt
CONFLICT (content): Merge conflict in tests/intel-ci/xe.blocklist.txt
Patch failed at 0001 tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests
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".