[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/4] drm/i915/tgl: Introduce gen12 forcewake ranges (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Thu Sep 12 22:33:43 UTC 2019
== Series Details ==
Series: series starting with [1/4] drm/i915/tgl: Introduce gen12 forcewake ranges (rev3)
URL : https://patchwork.freedesktop.org/series/66608/
State : failure
== Summary ==
Applying: drm/i915/tgl: Introduce gen12 forcewake ranges
Applying: drm/i915/tgl: s/ss/eu fuse reading support
Applying: drm/i915/tgl: Re-enable rc6
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_pci.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 drm/i915/tgl: Re-enable rc6
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
mailing list