All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
	Wambui Karuga <wambui.karugax@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx]  ✗ Fi.CI.BUILD: failure for drm/i915/display: conversion to drm_device based logging macros (rev5)
Date: Tue, 03 Mar 2020 17:20:52 +0200	[thread overview]
Message-ID: <87fteppiqz.fsf@intel.com> (raw)
In-Reply-To: <158324146545.15379.18277725887373195007@emeril.freedesktop.org>

On Tue, 03 Mar 2020, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915/display: conversion to drm_device based logging macros (rev5)
> URL   : https://patchwork.freedesktop.org/series/72760/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/dsb: convert to drm_device based logging macros.
> Applying: drm/i915/fbc: convert to drm_device based logging macros.
> Applying: drm/i915/fbdev: convert to drm_device based logging.
> Applying: drm/i915/fifo_underrun: convert to drm_device based logging.
> Applying: drm/i915/gmbus: convert to drm_device based logging,
> Applying: drm/i915/hdcp: convert to struct drm_device based logging.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_hdcp.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0006 drm/i915/hdcp: convert to struct drm_device based logging.
> 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".

Wambui, please rebase and resend the entire series. It's been a bit
unlucky in CI, getting failures until it doesn't apply anymore. :(

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2020-03-03 15:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-26 10:11 [Intel-gfx] [PATCH 00/10] drm/i915/display: conversion to drm_device based logging macros Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 01/10] drm/i915/dsb: convert " Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 02/10] drm/i915/fbc: " Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 03/10] drm/i915/fbdev: convert to drm_device based logging Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 04/10] drm/i915/fifo_underrun: " Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 05/10] drm/i915/gmbus: convert to drm_device based logging, Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 06/10] drm/i915/hdcp: convert to struct drm_device based logging Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 07/10] drm/i915/hotplug: convert to " Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 08/10] drm/i915/lpe_audio: convert to drm_device based logging macros Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 09/10] drm/i915/lvds: " Wambui Karuga
2020-02-26 10:11 ` [Intel-gfx] [PATCH 10/10] drm/i915/overlay: convert to drm_device based logging Wambui Karuga
2020-02-26 19:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: conversion to drm_device based logging macros (rev3) Patchwork
2020-02-26 20:07 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-02-27 10:14 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: conversion to drm_device based logging macros (rev4) Patchwork
2020-02-27 10:57 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-03-03 13:17 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: conversion to drm_device based logging macros (rev5) Patchwork
2020-03-03 15:20   ` Jani Nikula [this message]

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=87fteppiqz.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=patchwork@emeril.freedesktop.org \
    --cc=wambui.karugax@gmail.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.