From: Patchwork <patchwork@emeril.freedesktop.org>
To: Oscar Mateo <oscar.mateo@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with [2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions (rev3)
Date: Thu, 24 Aug 2017 17:19:06 -0000 [thread overview]
Message-ID: <20170824171906.775.1806@emeril.freedesktop.org> (raw)
In-Reply-To: <1503532705-3692-1-git-send-email-oscar.mateo@intel.com>
== Series Details ==
Series: series starting with [2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions (rev3)
URL : https://patchwork.freedesktop.org/series/29251/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/i915_irq.o
drivers/gpu/drm/i915/i915_irq.c: In function ‘intel_irq_init’:
drivers/gpu/drm/i915/i915_irq.c:4168:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~
drivers/gpu/drm/i915/i915_irq.c:4172:1: error: version control conflict marker in file
=======
^~~~~~~
drivers/gpu/drm/i915/i915_irq.c:4176:1: error: version control conflict marker in file
>>>>>>> drm/i915: Create vfuncs for the reset/enable/disable GuC functions
^~~~~~~
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_irq.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_irq.o] Error 1
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2017-08-24 17:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 23:58 [PATCH 1/2] drm/i915: Make some RPS functions static Oscar Mateo
2017-08-23 23:58 ` [PATCH 2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions Oscar Mateo
2017-08-24 13:07 ` Michal Wajdeczko
2017-08-24 17:12 ` [PATCH] " Oscar Mateo
2017-08-24 0:18 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Make some RPS functions static Patchwork
2017-08-24 10:28 ` [PATCH 1/2] " Kamble, Sagar A
2017-08-24 19:40 ` Rodrigo Vivi
2017-08-24 17:19 ` Patchwork [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=20170824171906.775.1806@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=oscar.mateo@intel.com \
/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