All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
	Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx]  ✗ Fi.CI.BUILD: failure for drm: Introduce struct drm_device based WARN* and use them in i915 (rev6)
Date: Wed, 19 Feb 2020 12:55:24 +0200	[thread overview]
Message-ID: <87mu9evobn.fsf@intel.com> (raw)
In-Reply-To: <158093792883.17318.129566537664332187@emeril.freedesktop.org>

On Wed, 05 Feb 2020, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm: Introduce struct drm_device based WARN* and use them in i915 (rev6)
> URL   : https://patchwork.freedesktop.org/series/72035/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/display/cdclk: Make WARN* drm specific where drm_priv ptr is available
> Applying: drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
> Applying: drm/i915/display/display: Make WARN* drm specific where drm_device ptr is available
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_display.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_display.c
> Applying: drm/i915/display/power: Make WARN* drm specific where drm_priv ptr is available
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/display/intel_display_power.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.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/display/power: Make WARN* drm specific where drm_priv ptr is available
> 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".

Pankaj, please don't expect people to respond to your patches if they
don't apply...

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-02-19 10:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05 17:34 [Intel-gfx] [PATCH v6 0/7] drm: Introduce struct drm_device based WARN* and use them in i915 Pankaj Bharadiya
2020-02-05 17:34 ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 1/7] drm/i915/display/cdclk: Make WARN* drm specific where drm_priv ptr is available Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 2/7] drm/i915/display/ddi: Make WARN* drm specific where drm_device " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 3/7] drm/i915/display/display: " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 4/7] drm/i915/display/power: Make WARN* drm specific where drm_priv " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 5/7] drm/i915/display/dp: Make WARN* drm specific where drm_device " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 6/7] drm/i915/display/global_state: " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 17:34 ` [Intel-gfx] [PATCH v6 7/7] drm/i915/display/hdcp: Make WARN* drm specific where drm_priv " Pankaj Bharadiya
2020-02-05 17:34   ` Pankaj Bharadiya
2020-02-05 21:25 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm: Introduce struct drm_device based WARN* and use them in i915 (rev6) Patchwork
2020-02-19 10:55   ` Jani Nikula [this message]
2020-02-19 11:00     ` Laxminarayan Bharadiya, Pankaj

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=87mu9evobn.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=pankaj.laxminarayan.bharadiya@intel.com \
    --cc=patchwork@emeril.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.