Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
	Kees Cook <keescook@chromium.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT: failure for gcc-plugins: Introduce stackinit plugin
Date: Wed, 23 Jan 2019 16:26:52 +0200	[thread overview]
Message-ID: <87y37b1mc3.fsf@intel.com> (raw)
In-Reply-To: <20190123112041.13505.7417@emeril.freedesktop.org>

On Wed, 23 Jan 2019, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: gcc-plugins: Introduce stackinit plugin
> URL   : https://patchwork.freedesktop.org/series/55630/
> State : failure
>
> == Summary ==
>
> Applying: treewide: Lift switch variables out of switches
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/drm_edid.c
> M	drivers/gpu/drm/i915/intel_display.c
> M	drivers/gpu/drm/i915/intel_pm.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_pm.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
> Auto-merging drivers/gpu/drm/i915/intel_display.c
> Auto-merging drivers/gpu/drm/drm_edid.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 treewide: Lift switch variables out of switches
> 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".

This obviously fails because the patch is against upstream rather than
our development tree. No worries.

BR,
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:[~2019-01-23 14:25 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-23 11:03 [PATCH 0/3] gcc-plugins: Introduce stackinit plugin Kees Cook
2019-01-23 11:03 ` [PATCH 1/3] treewide: Lift switch variables out of switches Kees Cook
2019-01-23 11:58   ` Greg KH
2019-01-23 12:09     ` Jann Horn
2019-01-23 12:12       ` Ard Biesheuvel
2019-01-23 13:21       ` William Kucharski
2019-01-23 14:17     ` [Intel-gfx] " Jani Nikula
2019-01-23 14:23       ` Jani Nikula
2019-01-23 14:47       ` Edwin Zimmerman
2019-01-23 15:46         ` Jani Nikula
2019-01-23 18:55           ` [Intel-gfx] " Kees Cook
2019-01-24  8:10             ` Greg KH
2019-01-23 19:18       ` Matthew Wilcox
2019-01-23 20:36         ` Kees Cook
2019-01-23 16:51   ` [Intel-wired-lan] " Jeff Kirsher
2019-01-24 12:58   ` Edwin Zimmerman
2019-01-23 11:03 ` [PATCH 2/3] gcc-plugins: Introduce stackinit plugin Kees Cook
2019-01-23 11:03 ` [PATCH 3/3] lib: Introduce test_stackinit module Kees Cook
2019-01-23 11:20 ` ✗ Fi.CI.BAT: failure for gcc-plugins: Introduce stackinit plugin Patchwork
2019-01-23 14:26   ` Jani Nikula [this message]
2019-01-29  0:12 ` [PATCH 0/3] " Alexander Popov
2019-02-12 17:54   ` Kees Cook

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=87y37b1mc3.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=keescook@chromium.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox