From: Jani Nikula <jani.nikula@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Subject: Re: ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
Date: Mon, 07 Oct 2019 14:36:30 +0300 [thread overview]
Message-ID: <87v9t0hjnl.fsf@intel.com> (raw)
In-Reply-To: <20191004132620.GB19803@latitude>
On Fri, 04 Oct 2019, Jonathan Neuschäfer <j.neuschaefer@gmx.net> 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@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
next prev parent reply other threads:[~2019-10-07 11:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 17:28 [PATCH] drm/i915: Add Sphinx-compatible references to struct fields Jonathan Neuschäfer
2019-10-03 18:45 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-04 13:26 ` Jonathan Neuschäfer
2019-10-07 11:36 ` Jani Nikula [this message]
2019-10-07 17:44 ` Jonathan Neuschäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v9t0hjnl.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=j.neuschaefer@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).