All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Ankit Navik <ankit.p.navik@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2)
Date: Mon, 25 Nov 2019 06:45:57 -0000	[thread overview]
Message-ID: <157466435734.15532.5879874125641805071@emeril.freedesktop.org> (raw)
In-Reply-To: <1574663945-31742-1-git-send-email-ankit.p.navik@intel.com>

== Series Details ==

Series: drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2)
URL   : https://patchwork.freedesktop.org/series/57989/
State : failure

== Summary ==

Applying: drm/i915: Get active pending request for given context
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
M	drivers/gpu/drm/i915/gem/i915_gem_context_types.h
M	drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
M	drivers/gpu/drm/i915/gt/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context_types.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.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: Get active pending request for given context
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: "Ankit Navik" <ankit.p.navik@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2)
Date: Mon, 25 Nov 2019 06:45:57 -0000	[thread overview]
Message-ID: <157466435734.15532.5879874125641805071@emeril.freedesktop.org> (raw)
Message-ID: <20191125064557.9GJ0UpDa64XWgpLlbfuT2UWhKruuSJzL210x6tk9uf0@z> (raw)
In-Reply-To: <1574663945-31742-1-git-send-email-ankit.p.navik@intel.com>

== Series Details ==

Series: drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2)
URL   : https://patchwork.freedesktop.org/series/57989/
State : failure

== Summary ==

Applying: drm/i915: Get active pending request for given context
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
M	drivers/gpu/drm/i915/gem/i915_gem_context_types.h
M	drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
M	drivers/gpu/drm/i915/gt/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context_types.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.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: Get active pending request for given context
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-25  6:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25  6:39 [PATCH v5 0/3] drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel Ankit Navik
2019-11-25  6:39 ` [Intel-gfx] " Ankit Navik
2019-11-25  6:39 ` [PATCH v5 1/3] drm/i915: Get active pending request for given context Ankit Navik
2019-11-25  6:39   ` [Intel-gfx] " Ankit Navik
2019-11-25  6:39 ` [PATCH v5 2/3] drm/i915: set optimum eu/slice/sub-slice configuration based on load type Ankit Navik
2019-11-25  6:39   ` [Intel-gfx] " Ankit Navik
2019-11-25  6:39 ` [PATCH v5 3/3] drm/i915: Predictive governor to control slice/subslice/eu Ankit Navik
2019-11-25  6:39   ` [Intel-gfx] " Ankit Navik
2019-11-25  6:45 ` Patchwork [this message]
2019-11-25  6:45   ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2) Patchwork
2019-11-25  8:16 ` [PATCH v5 0/3] drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel Chris Wilson
2019-11-25  8:16   ` [Intel-gfx] " Chris Wilson
2019-11-25 10:32   ` Navik, Ankit P
2019-11-25 10:32     ` [Intel-gfx] " Navik, Ankit P
2019-11-25 11:36     ` Chris Wilson
2019-11-25 11:36       ` [Intel-gfx] " Chris Wilson

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=157466435734.15532.5879874125641805071@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=ankit.p.navik@intel.com \
    --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.