✗ Fi.CI.BUILD: failure for series starting with [topic/core-for-CI,1/3] mei: me: add arrow lake point S DID
Patchwork
patchwork at emeril.freedesktop.org
Thu Feb 29 02:03:25 UTC 2024
== Series Details ==
Series: series starting with [topic/core-for-CI,1/3] mei: me: add arrow lake point S DID
URL : https://patchwork.freedesktop.org/series/130513/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/130513/revisions/1/mbox/ not applied
Applying: mei: me: add arrow lake point S DID
Using index info to reconstruct a base tree...
M drivers/misc/mei/hw-me-regs.h
M drivers/misc/mei/pci-me.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/misc/mei/pci-me.c
CONFLICT (content): Merge conflict in drivers/misc/mei/pci-me.c
Auto-merging drivers/misc/mei/hw-me-regs.h
CONFLICT (content): Merge conflict in drivers/misc/mei/hw-me-regs.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 mei: me: add arrow lake point S DID
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".
Build failed, no error log produced
More information about the Intel-gfx
mailing list