All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen (rev3)
Date: Tue, 05 Feb 2019 16:01:09 -0000	[thread overview]
Message-ID: <20190205160109.11905.44628@emeril.freedesktop.org> (raw)
In-Reply-To: <87y36u73o2.fsf@intel.com>

== Series Details ==

Series: drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen (rev3)
URL   : https://patchwork.freedesktop.org/series/54942/
State : failure

== Summary ==

Applying: drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
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: Try to sanitize bogus DPLL state left over by broken SNB BIOSen
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

  parent reply	other threads:[~2019-02-05 16:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-05 13:42 Fixes that failed to apply to v5.0-rc5 Jani Nikula
2019-02-05 14:18 ` [PATCH -fixes] drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen Ville Syrjala
2019-02-05 14:18   ` Ville Syrjala
2019-02-06  7:11   ` [Intel-gfx] " Jani Nikula
2019-02-07 16:32   ` Sasha Levin
2019-02-05 14:23 ` Fixes that failed to apply to v5.0-rc5 Ville Syrjälä
2019-02-06  7:13   ` Jani Nikula
2019-02-07 21:26     ` Sean Paul
2019-02-05 16:01 ` Patchwork [this message]
2019-02-08 13:07 ` Aditya Swarup
2019-02-08 17:51   ` Rodrigo Vivi

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=20190205160109.11905.44628@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /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.