✗ Fi.CI.BUILD: failure for series starting with [v3,1/3] drm/i915: enumerate and init each supported region

Patchwork
2019-10-18T12:41:49Z

== Series Details ==

Series: series starting with [v3,1/3] drm/i915: enumerate and init each supported region
URL : https://patchwork.freedesktop.org/series/68189/
State : failure

== Summary ==

Applying: drm/i915: enumerate and init each supported region
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_gem_gtt.c
M drivers/gpu/drm/i915/intel_device_info.h
M drivers/gpu/drm/i915/intel_memory_region.h
M drivers/gpu/drm/i915/selftests/mock_gem_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
Auto-merging drivers/gpu/drm/i915/intel_memory_region.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_memory_region.h
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915: enumerate and init each supported region
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".