All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT:  failure for Optimize use of DBuf slices (rev2)
Date: Wed, 25 Apr 2018 14:54:46 -0700	[thread overview]
Message-ID: <20180425215446.GH1994@intel.com> (raw)
In-Reply-To: <20180425214623.7324.67748@emeril.freedesktop.org>

On Wed, Apr 25, 2018 at 09:46:23PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: Optimize use of DBuf slices (rev2)
> URL   : https://patchwork.freedesktop.org/series/41180/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915/icl: track dbuf slice-2 status
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/i915_drv.h
> M	drivers/gpu/drm/i915/intel_display.c
> M	drivers/gpu/drm/i915/intel_pm.c
> M	drivers/gpu/drm/i915/intel_runtime_pm.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_display.c
> Auto-merging drivers/gpu/drm/i915/i915_drv.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
> Patch failed at 0001 drm/i915/icl: track dbuf slice-2 status
> The copy of the patch that failed is found in: .git/rebase-apply/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".

Mahesh, I'm really sorry for taking so long to review these patches....

Could you please send a rebased version so after CI giving the okay we push it.

Thanks in advance,
Rodrigo.

> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8588/issues.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2018-04-25 21:54 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-05  9:17 [PATCH 0/3] Optimize use of DBuf slices Mahesh Kumar
2018-04-05  9:17 ` [PATCH 1/3] drm/i915/icl: track dbuf slice-2 status Mahesh Kumar
2018-04-05  9:17 ` [PATCH 2/3] drm/i915/icl: Enable 2nd DBuf slice only when needed Mahesh Kumar
2018-04-25 23:46   ` Rodrigo Vivi
2018-04-05  9:17 ` [PATCH 3/3] drm/i915/icl: update ddb entry start/end mask during hw ddb readout Mahesh Kumar
2018-04-06  0:31   ` Lucas De Marchi
2018-04-25 23:45   ` Rodrigo Vivi
2018-04-05 10:01 ` ✓ Fi.CI.BAT: success for Optimize use of DBuf slices (rev2) Patchwork
2018-04-05 12:41 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-04-25 21:46 ` ✗ Fi.CI.BAT: " Patchwork
2018-04-25 21:54   ` Rodrigo Vivi [this message]
2018-04-26  8:19     ` Kumar, Mahesh

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=20180425215446.GH1994@intel.com \
    --to=rodrigo.vivi@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.