From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Alexander Usyskin" <alexander.usyskin@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Add driver for GSC controller (rev2)
Date: Wed, 19 Jan 2022 17:47:15 -0000 [thread overview]
Message-ID: <164261443520.22605.14878321817115787811@emeril.freedesktop.org> (raw)
In-Reply-To: <20220119155807.222657-1-alexander.usyskin@intel.com>
== Series Details ==
Series: Add driver for GSC controller (rev2)
URL : https://patchwork.freedesktop.org/series/98066/
State : failure
== Summary ==
Applying: drm/i915/gsc: add gsc as a mei auxiliary device
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/Kconfig
M drivers/gpu/drm/i915/Makefile
M drivers/gpu/drm/i915/gt/intel_gt.c
M drivers/gpu/drm/i915/gt/intel_gt.h
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pci.c
M drivers/gpu/drm/i915/i915_reg.h
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
Auto-merging drivers/gpu/drm/i915/Makefile
Auto-merging drivers/gpu/drm/i915/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gsc: add gsc as a mei auxiliary device
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".
next prev parent reply other threads:[~2022-01-19 17:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 15:58 [PATCH v2 0/5] Add driver for GSC controller Alexander Usyskin
2022-01-19 15:58 ` [Intel-gfx] " Alexander Usyskin
2022-01-19 15:58 ` [PATCH v2 1/5] drm/i915/gsc: add gsc as a mei auxiliary device Alexander Usyskin
2022-01-19 15:58 ` [Intel-gfx] " Alexander Usyskin
2022-01-19 15:58 ` [PATCH v2 2/5] mei: add support for graphics system controller (gsc) devices Alexander Usyskin
2022-01-19 15:58 ` [Intel-gfx] " Alexander Usyskin
2022-01-26 18:05 ` Greg Kroah-Hartman
2022-01-26 18:05 ` [Intel-gfx] " Greg Kroah-Hartman
2022-01-27 8:51 ` Usyskin, Alexander
2022-01-27 8:51 ` [Intel-gfx] " Usyskin, Alexander
2022-01-27 9:12 ` Jani Nikula
2022-01-27 9:12 ` [Intel-gfx] " Jani Nikula
2022-01-19 15:58 ` [Intel-gfx] [PATCH v2 3/5] mei: gsc: setup char driver alive in spite of firmware handshake failure Alexander Usyskin
2022-01-19 15:58 ` Alexander Usyskin
2022-01-19 15:58 ` [Intel-gfx] [PATCH v2 4/5] mei: gsc: add runtime pm handlers Alexander Usyskin
2022-01-19 15:58 ` Alexander Usyskin
2022-01-26 18:06 ` Greg Kroah-Hartman
2022-01-26 18:06 ` [Intel-gfx] " Greg Kroah-Hartman
2022-01-19 15:58 ` [Intel-gfx] [PATCH v2 5/5] mei: gsc: retrieve the firmware version Alexander Usyskin
2022-01-19 15:58 ` Alexander Usyskin
2022-01-19 17:47 ` Patchwork [this message]
2022-01-19 17:51 ` [PATCH v2 0/5] Add driver for GSC controller Greg Kroah-Hartman
2022-01-19 17:51 ` [Intel-gfx] " Greg Kroah-Hartman
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=164261443520.22605.14878321817115787811@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=alexander.usyskin@intel.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.