Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Tomas Janousek <tomi@nomi.cz>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
Date: Wed, 30 Oct 2019 07:53:13 -0000	[thread overview]
Message-ID: <20191030075313.8996.28597@emeril.freedesktop.org> (raw)
In-Reply-To: <20191028212527.24401-1-don.hiatt@intel.com>

== Series Details ==

Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
URL   : https://patchwork.freedesktop.org/series/68685/
State : failure

== Summary ==

Applying: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/intel_uc.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_uc.c deleted in HEAD and modified in drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission. Version drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission of drivers/gpu/drm/i915/intel_uc.c left in tree.
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/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
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: "Tomas Janousek" <tomi@nomi.cz>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
Date: Wed, 30 Oct 2019 07:53:13 -0000	[thread overview]
Message-ID: <20191030075313.8996.28597@emeril.freedesktop.org> (raw)
Message-ID: <20191030075313._Dr9WdzmkKNuPHqrJDg8NfA7bTnqYcZhlwwpjH5wDCc@z> (raw)
In-Reply-To: <20191028212527.24401-1-don.hiatt@intel.com>

== Series Details ==

Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
URL   : https://patchwork.freedesktop.org/series/68685/
State : failure

== Summary ==

Applying: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/intel_uc.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_uc.c deleted in HEAD and modified in drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission. Version drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission of drivers/gpu/drm/i915/intel_uc.c left in tree.
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/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
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-10-30  7:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 21:25 [PATCH] drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission don.hiatt
2019-10-28 21:25 ` [Intel-gfx] " don.hiatt
2019-10-29  0:58 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-10-29  0:58   ` [Intel-gfx] " Patchwork
2019-10-29 12:33 ` [PATCH] " Michal Wajdeczko
2019-10-29 12:33   ` [Intel-gfx] " Michal Wajdeczko
2019-10-29 21:15   ` Hiatt, Don
2019-10-29 21:15     ` [Intel-gfx] " Hiatt, Don
2019-10-30  7:25   ` Tomas Janousek
2019-10-30  7:25     ` [Intel-gfx] " Tomas Janousek
2019-10-30  7:53 ` Patchwork [this message]
2019-10-30  7:53   ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2) 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=20191030075313.8996.28597@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tomi@nomi.cz \
    /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