[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields

[Jonathan Neuschäfer]

On Thu, Oct 03, 2019 at 06:45:56PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Add Sphinx-compatible references to struct fields
> URL   : https://patchwork.freedesktop.org/series/67550/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915: Add Sphinx-compatible references to struct fields
> 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...
> Auto-merging drivers/gpu/drm/i915/i915_drv.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h

I'm not sure what's wrong here. The patch applies cleanly to v5.4-rc1
and linux-next. Maybe patchwork is applying it to an older base?


Thanks,
Jonathan Neuschäfer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20191004/f679e520/attachment.sig>