✗ Fi.CI.BAT: failure for drm/core: Remove drm_dev_unref() and it's uses

[Patchwork <patchwork@emeril.freedesktop.org>]

== Series Details ==

Series: drm/core: Remove drm_dev_unref() and it's uses
URL   : https://patchwork.freedesktop.org/series/42325/
State : failure

== Summary ==

Applying: drm/core: Remove drm_dev_unref() and it's uses
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_drv.c
M	drivers/gpu/drm/exynos/exynos_drm_drv.c
M	drivers/gpu/drm/mxsfb/mxsfb_drv.c
M	drivers/gpu/drm/omapdrm/omap_drv.c
M	drivers/gpu/drm/sti/sti_drv.c
M	drivers/gpu/drm/stm/drv.c
M	drivers/gpu/drm/tegra/drm.c
M	drivers/gpu/drm/tinydrm/core/tinydrm-core.c
M	drivers/gpu/drm/udl/udl_drv.c
M	drivers/gpu/drm/vc4/vc4_drv.c
M	include/drm/drm_drv.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_drv.h
Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_drv.c
Auto-merging drivers/gpu/drm/udl/udl_drv.c
Auto-merging drivers/gpu/drm/tinydrm/core/tinydrm-core.c
Auto-merging drivers/gpu/drm/tegra/drm.c
Auto-merging drivers/gpu/drm/stm/drv.c
Auto-merging drivers/gpu/drm/sti/sti_drv.c
Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c
Auto-merging drivers/gpu/drm/mxsfb/mxsfb_drv.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
Auto-merging drivers/gpu/drm/drm_drv.c
Patch failed at 0001 drm/core: Remove drm_dev_unref() and it's uses
The copy of the patch that failed is found in: .git/rebase-apply/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".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx