✗ Fi.CI.BUILD: failure for tracing/treewide: Remove second parameter of __assign_str() (rev3)

[Patchwork]

== Series Details ==

Series: tracing/treewide: Remove second parameter of __assign_str() (rev3)
URL   : https://patchwork.freedesktop.org/series/130320/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/130320/revisions/3/mbox/ not applied
Applying: tracing/treewide: Remove second parameter of __assign_str()
Using index info to reconstruct a base tree...
M	drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
M	drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h
M	drivers/thermal/thermal_trace.h
M	fs/smb/client/trace.h
M	include/trace/events/btrfs.h
M	include/trace/events/sched.h
M	net/wireless/trace.h
Falling back to patching base and 3-way merge...
Auto-merging net/wireless/trace.h
Auto-merging include/trace/events/sched.h
CONFLICT (content): Merge conflict in include/trace/events/sched.h
Auto-merging include/trace/events/btrfs.h
Auto-merging fs/smb/client/trace.h
Auto-merging drivers/thermal/thermal_trace.h
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.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 tracing/treewide: Remove second parameter of __assign_str()
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