public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915: Pull intel_uncore_arm_unclaimed_mmio_detection() under the spinlock
Date: Tue, 04 Sep 2018 13:13:15 -0000	[thread overview]
Message-ID: <20180904131315.7481.43725@emeril.freedesktop.org> (raw)
In-Reply-To: <20180904131207.17563-1-chris@chris-wilson.co.uk>

== Series Details ==

Series: drm/i915: Pull intel_uncore_arm_unclaimed_mmio_detection() under the spinlock
URL   : https://patchwork.freedesktop.org/series/49128/
State : failure

== Summary ==

Applying: drm/i915: Pull intel_uncore_arm_unclaimed_mmio_detection() under the spinlock
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_uncore.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_uncore.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_uncore.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Pull intel_uncore_arm_unclaimed_mmio_detection() under the spinlock
Use 'git am --show-current-patch' to see the failed patch
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

  reply	other threads:[~2018-09-04 13:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-04 13:12 [PATCH] drm/i915: Pull intel_uncore_arm_unclaimed_mmio_detection() under the spinlock Chris Wilson
2018-09-04 13:13 ` Patchwork [this message]
2018-09-04 13:29 ` Mika Kuoppala
2018-09-04 14:57 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-09-04 20:22 ` ✓ Fi.CI.IGT: " Patchwork

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=20180904131315.7481.43725@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=chris@chris-wilson.co.uk \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox