✗ Fi.CI.BUILD: failure for More improvements to scripts/xls_to_doc.py (rev2)

[Patchwork]

== Series Details ==

Series: More improvements to scripts/xls_to_doc.py (rev2)
URL   : https://patchwork.freedesktop.org/series/131130/
State : failure

== Summary ==

Applying: scripts/xls_to_doc.py: make the message about wildcards clearer
Applying: scripts/xls_to_doc.py: don't ignore the last column
Applying: scripts/xls_to_doc.py: be clearer when ignoring a value in verbose mode
Applying: scripts/xls_to_doc.py: detect field removal
Applying: scripts/xls_to_doc.py: improve the addition logic
Applying: scripts/xls_to_doc.py: preserve line for found fields
Applying: scripts/xls_to_doc.py: don't duplicate a common field
Applying: scripts/xls_to_doc.py: reduce verbosity for writing message
Applying: scripts/xls_to_doc.py: better handle common attributes
Applying: scripts/xls_to_doc.py: make pylint happy
Using index info to reconstruct a base tree...
M	scripts/xls_to_doc.py
Falling back to patching base and 3-way merge...
Auto-merging scripts/xls_to_doc.py
CONFLICT (content): Merge conflict in scripts/xls_to_doc.py
Patch failed at 0010 scripts/xls_to_doc.py: make pylint happy
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".