[Intel-gfx] ✗ Fi.CI.BAT: failure for drm: Add generic fbdev emulation (rev2)

[Patchwork]

== Series Details ==

Series: drm: Add generic fbdev emulation (rev2)
URL   : https://patchwork.freedesktop.org/series/45848/
State : failure

== Summary ==

Applying: drm: Begin an API for in-kernel clients
Using index info to reconstruct a base tree...
M	Documentation/gpu/index.rst
M	drivers/gpu/drm/Makefile
M	drivers/gpu/drm/drm_drv.c
M	drivers/gpu/drm/drm_file.c
M	drivers/gpu/drm/drm_probe_helper.c
M	include/drm/drm_device.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_client.h
CONFLICT (add/add): Merge conflict in include/drm/drm_client.h
Auto-merging drivers/gpu/drm/drm_client.c
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/drm_client.c
error: Failed to merge in the changes.
Patch failed at 0001 drm: Begin an API for in-kernel clients
Use 'git am --show-current-patch' to see the failed patch
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".