[Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with drm/i915: pwrite/pread do not require obj->base.filp, just pages (rev2)

[Patchwork]

== Series Details ==

Series: series starting with drm/i915: pwrite/pread do not require obj->base.filp, just pages (rev2)
URL   : https://patchwork.freedesktop.org/series/8528/
State : failure

== Summary ==

Applying: drm/i915: pwrite/pread do not require obj->base.filp, just pages
Applying: drm/i915: Introduce i915_gem_object_get_dma_address()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Use insert_page for pwrite_fast
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
error: Failed to merge in the changes.
Patch failed at 0003 drm/i915: Use insert_page for pwrite_fast
The copy of the patch that failed is found in: .git/rebase-apply/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".