All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Lee Shawn C <shawn.c.lee@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for drm/i915: update rawclk also on resume (rev2)
Date: Fri, 01 Nov 2019 06:56:31 -0000	[thread overview]
Message-ID: <20191101065631.19148.72515@emeril.freedesktop.org> (raw)
In-Reply-To: <20191031111407.12493-1-jani.nikula@intel.com>

== Series Details ==

Series: drm/i915: update rawclk also on resume (rev2)
URL   : https://patchwork.freedesktop.org/series/68817/
State : failure

== Summary ==

Applying: drm/i915: update rawclk also on resume
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display_power.c
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_power.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: update rawclk also on resume
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

WARNING: multiple messages have this Message-ID (diff)
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Lee Shawn C" <shawn.c.lee@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: update rawclk also on resume (rev2)
Date: Fri, 01 Nov 2019 06:56:31 -0000	[thread overview]
Message-ID: <20191101065631.19148.72515@emeril.freedesktop.org> (raw)
Message-ID: <20191101065631.qFdX_IUcXrtWf-ylGPqWEYyw1wSXl2Bi-SBhNj-C7bI@z> (raw)
In-Reply-To: <20191031111407.12493-1-jani.nikula@intel.com>

== Series Details ==

Series: drm/i915: update rawclk also on resume (rev2)
URL   : https://patchwork.freedesktop.org/series/68817/
State : failure

== Summary ==

Applying: drm/i915: update rawclk also on resume
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display_power.c
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_power.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: update rawclk also on resume
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-11-01  6:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-31 11:14 [PATCH] drm/i915: update rawclk also on resume Jani Nikula
2019-10-31 11:14 ` [Intel-gfx] " Jani Nikula
2019-10-31 13:53 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-10-31 13:53   ` [Intel-gfx] " Patchwork
2019-10-31 13:56 ` [PATCH] " Ville Syrjälä
2019-10-31 13:56   ` [Intel-gfx] " Ville Syrjälä
2019-11-01  3:17   ` Lee, Shawn C
2019-11-01  3:17     ` [Intel-gfx] " Lee, Shawn C
2019-11-01  6:56 ` Patchwork [this message]
2019-11-01  6:56   ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: update rawclk also on resume (rev2) Patchwork
2019-11-01  9:03 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: update rawclk also on resume (rev3) Patchwork
2019-11-01  9:03   ` [Intel-gfx] " Patchwork
2019-11-01  9:33 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-01  9:33   ` [Intel-gfx] " Patchwork
2019-11-01 13:18 ` ✓ Fi.CI.IGT: success for drm/i915: update rawclk also on resume Patchwork
2019-11-01 13:18   ` [Intel-gfx] " Patchwork
2019-11-01 14:45 ` [PATCH v2] " Lee Shawn C
2019-11-01 14:45   ` [Intel-gfx] " Lee Shawn C
2019-11-01 16:29 ` [PATCH v3] " Lee Shawn C
2019-11-01 16:29   ` [Intel-gfx] " Lee Shawn C
2019-11-01 14:24   ` Jani Nikula
2019-11-01 14:24     ` [Intel-gfx] " Jani Nikula

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=20191101065631.19148.72515@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=shawn.c.lee@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.