✗ Fi.CI.BAT: failure for series starting with [01/13] drm/i915/gtt: Cache the PTE encoding of the scratch page

[Patchwork]

== Series Details ==

Series: series starting with [01/13] drm/i915/gtt: Cache the PTE encoding of the scratch page
URL   : https://patchwork.freedesktop.org/series/44774/
State : failure

== Summary ==

Applying: drm/i915/gtt: Cache the PTE encoding of the scratch page
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
M	drivers/gpu/drm/i915/i915_gem_gtt.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/gtt: Reduce a pair of runtime asserts
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
M	drivers/gpu/drm/i915/i915_gem_gtt.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.h
Patch failed at 0002 drm/i915/gtt: Reduce a pair of runtime asserts
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".