All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wambui Karuga <wambui.karugax@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Subject: Re: [Intel-gfx]  ✗ Fi.CI.BUILD: failure for conversion to struct drm_device logging macros.
Date: Wed, 22 Jan 2020 00:56:11 +0300 (EAT)	[thread overview]
Message-ID: <alpine.LNX.2.21.99999.375.2001220055360.29494@wambui> (raw)
In-Reply-To: <157963624983.11481.6092790115438048450@emeril.freedesktop.org>



On Tue, 21 Jan 2020, Patchwork wrote:

> == Series Details ==
>
> Series: conversion to struct drm_device logging macros.
> URL   : https://patchwork.freedesktop.org/series/72349/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/dsi: conversion to struct drm_device log macros
> Applying: drm/i915/ddi: convert to struct drm_device log macros.
> Applying: drm/i915/power: convert to struct drm_device macros in display/intel_display_power.c
> Applying: drm/i915/dp: conversion to struct drm_device logging macros.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_dp.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0004 drm/i915/dp: conversion to struct drm_device 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".
>
>
I'll send a v2 for this - from what I can tell one of the hunks changed 
and can't apply cleanly.

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

      reply	other threads:[~2020-01-23 10:23 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-21 14:31 [PATCH 0/6] conversion to struct drm_device logging macros Wambui Karuga
2020-01-21 14:31 ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31 ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 1/6] drm/i915/dsi: conversion to struct drm_device log macros Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 2/6] drm/i915/ddi: convert " Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 3/6] drm/i915/power: convert to struct drm_device macros in display/intel_display_power.c Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 4/6] drm/i915/dp: conversion to struct drm_device logging macros Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 5/6] drm/i915/opregion: " Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 14:31 ` [PATCH 6/6] drm/i915/hdcp: conversion to struct drm_device based " Wambui Karuga
2020-01-21 14:31   ` [Intel-gfx] " Wambui Karuga
2020-01-21 14:31   ` Wambui Karuga
2020-01-21 19:50 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for conversion to struct drm_device " Patchwork
2020-01-21 21:56   ` Wambui Karuga [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=alpine.LNX.2.21.99999.375.2001220055360.29494@wambui \
    --to=wambui.karugax@gmail.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.