✗ Fi.CI.BAT: failure for series starting with [01/31] drm/i915: Split GEM object type definition to its own header

Patchwork patchwork at emeril.freedesktop.org
Thu May 23 22:48:19 UTC 2019


== Series Details ==

Series: series starting with [01/31] drm/i915: Split GEM object type definition to its own header
URL   : https://patchwork.freedesktop.org/series/61065/
State : failure

== Summary ==

Applying: drm/i915: Split GEM object type definition to its own header
Applying: drm/i915: Pull GEM ioctls interface to its own file
Applying: drm/i915: Move object->pages API to i915_gem_object.[ch]
Applying: drm/i915: Move shmem object setup to its own file
Applying: drm/i915: Move phys objects to its own file
Applying: drm/i915: Move mmap and friends to its own file
Applying: drm/i915: Move GEM domain management to its own file
Applying: drm/i915: Move more GEM objects under gem/
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_reset.c
M	drivers/gpu/drm/i915/gt/selftest_hangcheck.c
M	drivers/gpu/drm/i915/i915_gem_internal.c
M	drivers/gpu/drm/i915/intel_guc_submission.c
Falling back to patching base and 3-way merge...
Removing drivers/gpu/drm/i915/selftests/mock_dmabuf.h
Removing drivers/gpu/drm/i915/selftests/mock_context.h
Removing drivers/gpu/drm/i915/selftests/huge_gem_object.h
Auto-merging drivers/gpu/drm/i915/intel_guc_submission.c
Removing drivers/gpu/drm/i915/i915_gemfs.h
Removing drivers/gpu/drm/i915/i915_gem_clflush.h
Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_hangcheck.c
Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c
Patch failed at 0008 drm/i915: Move more GEM objects under gem/
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".



More information about the Intel-gfx-trybot mailing list