All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
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: Fri, 4 Oct 2019 15:26:20 +0200	[thread overview]
Message-ID: <20191004132620.GB19803@latitude> (raw)
In-Reply-To: <20191003184556.3225.20950@emeril.freedesktop.org>


[-- Attachment #1.1: Type: text/plain, Size: 769 bytes --]

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

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2019-10-04 13:26 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 [this message]
2019-10-07 11:36     ` Jani Nikula
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=20191004132620.GB19803@latitude \
    --to=j.neuschaefer@gmx.net \
    --cc=intel-gfx@lists.freedesktop.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.