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: conversion to new drm logging macros.
Date: Fri, 17 Jan 2020 17:49:21 +0200	[thread overview]
Message-ID: <874kwugk1q.fsf@intel.com> (raw)
In-Reply-To: <157915478536.12911.15228178797622825279@emeril.freedesktop.org>

On Thu, 16 Jan 2020, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915: conversion to new drm logging macros.
> URL   : https://patchwork.freedesktop.org/series/72096/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/atomic: use new logging macros for debug
> Applying: drm/i915/audio: convert to new drm logging macros.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_audio.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_audio.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_audio.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0002 drm/i915/audio: convert to new drm logging macros.
> 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".

When you see this, please rebase and repost. We don't apply patches
unless they've passed our CI.

Thanks,
Jani.

>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
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-01-17 15:50 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-14  9:51 [PATCH 0/5] drm/i915: conversion to new drm logging macros Wambui Karuga
2020-01-14  9:51 ` Wambui Karuga
2020-01-14  9:51 ` [Intel-gfx] " Wambui Karuga
2020-01-14  9:51 ` [PATCH 1/5] drm/i915/atomic: use new logging macros for debug Wambui Karuga
2020-01-14  9:51   ` Wambui Karuga
2020-01-14  9:51   ` [Intel-gfx] " Wambui Karuga
2020-01-14  9:51 ` [PATCH 2/5] drm/i915/audio: convert to new drm logging macros Wambui Karuga
2020-01-14  9:51   ` Wambui Karuga
2020-01-14  9:51   ` [Intel-gfx] " Wambui Karuga
2020-01-14 14:23   ` Jani Nikula
2020-01-14 14:23     ` Jani Nikula
2020-01-14 14:23     ` [Intel-gfx] " Jani Nikula
2020-01-14 14:24     ` Jani Nikula
2020-01-14 14:24       ` Jani Nikula
2020-01-14 14:24       ` [Intel-gfx] " Jani Nikula
2020-01-14 15:00       ` Wambui Karuga
2020-01-14 15:00         ` Wambui Karuga
2020-01-14 15:00         ` [Intel-gfx] " Wambui Karuga
2020-01-14  9:51 ` [PATCH 3/5] drm/i915/bios: " Wambui Karuga
2020-01-14  9:51   ` Wambui Karuga
2020-01-14  9:51   ` [Intel-gfx] " Wambui Karuga
2020-01-14  9:51 ` [PATCH 4/5] drm/i915/bw: convert to new drm_device based " Wambui Karuga
2020-01-14  9:51   ` Wambui Karuga
2020-01-14  9:51   ` [Intel-gfx] " Wambui Karuga
2020-01-14  9:51 ` [PATCH 5/5] drm/i915/cdclk: use new drm " Wambui Karuga
2020-01-14  9:51   ` Wambui Karuga
2020-01-14  9:51   ` [Intel-gfx] " Wambui Karuga
2020-01-16  6:06 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: conversion to " Patchwork
2020-01-17 15:49   ` 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=874kwugk1q.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.