All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: Kees Cook <keescook@chromium.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for gcc-plugins: Introduce stackinit plugin
Date: Wed, 23 Jan 2019 11:20:41 -0000	[thread overview]
Message-ID: <20190123112041.13505.7417@emeril.freedesktop.org> (raw)
In-Reply-To: <20190123110349.35882-1-keescook@chromium.org>

== 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".

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

  parent reply	other threads:[~2019-01-23 11:20 UTC|newest]

Thread overview: 96+ 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 ` [Intel-wired-lan] " Kees Cook
2019-01-23 11:03 ` [PATCH 1/3] treewide: Lift switch variables out of switches Kees Cook
2019-01-23 11:03 ` Kees Cook
2019-01-23 11:03   ` [Intel-wired-lan] " Kees Cook
2019-01-23 11:03   ` Kees Cook
2019-01-23 11:03   ` [1/3] " Kees Cook
2019-01-23 11:58   ` [PATCH 1/3] " Greg KH
2019-01-23 11:58   ` Greg KH
2019-01-23 11:58     ` [Intel-wired-lan] " Greg KH
2019-01-23 11:58     ` [1/3] " Greg Kroah-Hartman
2019-01-23 12:09     ` [PATCH 1/3] " Jann Horn
2019-01-23 12:09     ` Jann Horn
2019-01-23 12:09       ` [Intel-wired-lan] " Jann Horn
2019-01-23 12:09       ` Jann Horn
2019-01-23 12:09       ` [1/3] " Jann Horn
2019-01-23 12:12       ` [PATCH 1/3] " Ard Biesheuvel
2019-01-23 12:12       ` Ard Biesheuvel
2019-01-23 12:12         ` [Intel-wired-lan] " Ard Biesheuvel
2019-01-23 12:12         ` Ard Biesheuvel
2019-01-23 12:12         ` [1/3] " Ard Biesheuvel
2019-01-23 13:21       ` [PATCH 1/3] " William Kucharski
2019-01-23 13:21       ` William Kucharski
2019-01-23 13:21         ` [Intel-wired-lan] " William Kucharski
2019-01-23 13:21         ` [1/3] " William Kucharski
2019-01-23 14:17     ` [Intel-gfx] [PATCH 1/3] " Jani Nikula
2019-01-23 14:17       ` [Intel-wired-lan] " Jani Nikula
2019-01-23 14:17       ` Jani Nikula
2019-01-23 14:17       ` [1/3] " Jani Nikula
2019-01-23 14:23       ` [Intel-gfx] [PATCH 1/3] " Jani Nikula
2019-01-23 14:23       ` Jani Nikula
2019-01-23 14:23         ` [Intel-wired-lan] " Jani Nikula
2019-01-23 14:23         ` [1/3] " Jani Nikula
2019-01-23 14:47       ` [Intel-gfx] [PATCH 1/3] " Edwin Zimmerman
2019-01-23 14:47         ` [Intel-wired-lan] " Edwin Zimmerman
2019-01-23 14:47         ` Edwin Zimmerman
2019-01-23 14:47         ` [1/3] " Edwin Zimmerman
2019-01-23 14:47         ` [Intel-gfx] [PATCH 1/3] " Edwin Zimmerman
2019-01-23 15:46         ` Jani Nikula
2019-01-23 15:46         ` Jani Nikula
2019-01-23 15:46           ` [Intel-wired-lan] " Jani Nikula
2019-01-23 15:46           ` Jani Nikula
2019-01-23 15:46           ` [1/3] " Jani Nikula
2019-01-23 18:55           ` [Intel-gfx] [PATCH 1/3] " Kees Cook
2019-01-23 18:55             ` [Intel-wired-lan] " Kees Cook
2019-01-23 18:55             ` Kees Cook
2019-01-23 18:55             ` [1/3] " Kees Cook
2019-01-23 18:55             ` [Intel-gfx] [PATCH 1/3] " Kees Cook
2019-01-24  8:10             ` Greg KH
2019-01-24  8:10             ` Greg KH
2019-01-24  8:10               ` [Intel-wired-lan] " Greg KH
2019-01-24  8:10               ` [1/3] " Greg Kroah-Hartman
2019-01-24  8:10               ` [Intel-gfx] [PATCH 1/3] " Greg KH
2019-01-23 18:55           ` Kees Cook
2019-01-23 19:18       ` Matthew Wilcox
2019-01-23 19:18         ` [Intel-wired-lan] " Matthew Wilcox
2019-01-23 19:18         ` [1/3] " Matthew Wilcox
2019-01-23 20:36         ` [Intel-gfx] [PATCH 1/3] " Kees Cook
2019-01-23 20:36         ` Kees Cook
2019-01-23 20:36           ` [Intel-wired-lan] " Kees Cook
2019-01-23 20:36           ` Kees Cook
2019-01-23 20:36           ` [1/3] " Kees Cook
2019-01-23 20:36           ` [Intel-gfx] [PATCH 1/3] " Kees Cook
2019-01-23 19:18       ` Matthew Wilcox
2019-01-23 14:17     ` Jani Nikula
2019-01-23 16:51   ` [Intel-wired-lan] " Jeff Kirsher
2019-01-23 16:51     ` Jeff Kirsher
2019-01-23 16:51     ` Jeff Kirsher
2019-01-23 16:51     ` [1/3] " Jeff Kirsher
2019-01-23 16:51   ` [Intel-wired-lan] [PATCH 1/3] " Jeff Kirsher
2019-01-24 12:58   ` Edwin Zimmerman
2019-01-24 12:58     ` [Intel-wired-lan] " Edwin Zimmerman
2019-01-24 12:58     ` [1/3] " Edwin Zimmerman
2019-01-24 12:58     ` [PATCH 1/3] " Edwin Zimmerman
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   ` [Intel-wired-lan] " Kees Cook
2019-01-23 11:03   ` Kees Cook
2019-01-23 11:03   ` [2/3] " Kees Cook
2019-01-23 11:03 ` [PATCH 2/3] " Kees Cook
2019-01-23 11:03 ` [PATCH 3/3] lib: Introduce test_stackinit module Kees Cook
2019-01-23 11:03   ` [Intel-wired-lan] " Kees Cook
2019-01-23 11:03   ` Kees Cook
2019-01-23 11:03   ` [3/3] " Kees Cook
2019-01-23 11:03 ` [PATCH 3/3] " Kees Cook
2019-01-23 11:20 ` Patchwork [this message]
2019-01-23 14:26   ` ✗ Fi.CI.BAT: failure for gcc-plugins: Introduce stackinit plugin Jani Nikula
2019-01-29  0:12 ` [PATCH 0/3] " Alexander Popov
2019-01-29  0:12 ` Alexander Popov
2019-01-29  0:12   ` [Intel-wired-lan] " Alexander Popov
2019-02-12 17:54   ` Kees Cook
2019-02-12 17:54   ` Kees Cook
2019-02-12 17:54     ` [Intel-wired-lan] " Kees Cook
2019-02-12 17:54     ` Kees Cook
2019-02-12 17:54     ` Kees Cook
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=20190123112041.13505.7417@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=keescook@chromium.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.