✗ Fi.CI.BUILD: failure for series starting with [1/8] FIXME: drm/i915/tgl: Register state context definition for Gen12 (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Tue Sep 10 08:58:42 UTC 2019
== Series Details ==
Series: series starting with [1/8] FIXME: drm/i915/tgl: Register state context definition for Gen12 (rev2)
URL : https://patchwork.freedesktop.org/series/66299/
State : failure
== Summary ==
Applying: FIXME: drm/i915/tgl: Register state context definition for Gen12
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/gt/intel_lrc_reg.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc_reg.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc_reg.h
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
Patch failed at 0001 FIXME: drm/i915/tgl: Register state context definition for Gen12
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