[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: split GVT as separated module

[Patchwork]

== Series Details ==

Series: drm/i915: split GVT as separated module
URL   : https://patchwork.freedesktop.org/series/49605/
State : failure

== Summary ==

Applying: drm/i915: split GVT as separated module
.git/rebase-apply/patch:102: trailing whitespace.
		
.git/rebase-apply/patch:111: trailing whitespace.
	
.git/rebase-apply/patch:196: trailing whitespace.
	
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gem.c
M	drivers/gpu/drm/i915/i915_gem_context.c
M	drivers/gpu/drm/i915/i915_gem_gtt.c
M	drivers/gpu/drm/i915/intel_ringbuffer.c
M	drivers/gpu/drm/i915/intel_uncore.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_uncore.c
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
Removing drivers/gpu/drm/i915/intel_gvt.h
Removing drivers/gpu/drm/i915/intel_gvt.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: split GVT as separated module
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".