Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
On Mon, Oct 07, 2019 at 02:36:30PM +0300, Jani Nikula wrote:
> On Fri, 04 Oct 2019, Jonathan Neuschäfer wrote:
[...]
> > 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?
>
> On the contrary, to a much newer base. Try drm-tip branch of [1].
>
> BR,
> Jani.
>
> [1] https://cgit.freedesktop.org/drm/drm-tip
Thanks for the hint!
Turns out someone already sent a similar fix, commit 56316cbc9c98
("drm/i915/perf: Fix use of kernel-doc format in structure members").
Jonathan Neuschäfer
signature.asc
Description: PGP signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
On Fri, 04 Oct 2019, Jonathan Neuschäfer wrote: > On Thu, Oct 03, 2019 at 06:45:56PM -, 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... >> Mdrivers/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? On the contrary, to a much newer base. Try drm-tip branch of [1]. BR, Jani. [1] https://cgit.freedesktop.org/drm/drm-tip > > > Thanks, > Jonathan Neuschäfer > ___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
On Thu, Oct 03, 2019 at 06:45:56PM -, 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 signature.asc Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
== 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: Add Sphinx-compatible references to struct fields 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". ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
