[Intel-gfx] ✗ Fi.CI.BUILD: failure for relay: allow the use of const callback structs

[Patchwork]

== Series Details ==

Series: relay: allow the use of const callback structs
URL   : https://patchwork.freedesktop.org/series/84209/
State : failure

== Summary ==

Applying: relay: allow the use of const callback structs
Using index info to reconstruct a base tree...
M	include/linux/relay.h
M	kernel/relay.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/relay.c
CONFLICT (content): Merge conflict in kernel/relay.c
Auto-merging include/linux/relay.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 relay: allow the use of const callback structs
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".