On Fri, 04 Oct 2019, Jonathan Neuschäfer <j.neuschaefer@xxxxxxx> wrote: > 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? 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@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
