From: Patchwork <patchwork@emeril.freedesktop.org>
To: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,v2,3/3] lib: Use drm_get_param where it is applicable (rev4)
Date: Fri, 23 Nov 2018 15:37:00 -0000 [thread overview]
Message-ID: <20181123153700.3990.65569@emeril.freedesktop.org> (raw)
In-Reply-To: <20181123142726.27625-1-lukasz.kalamarz@intel.com>
== Series Details ==
Series: series starting with [i-g-t,v2,3/3] lib: Use drm_get_param where it is applicable (rev4)
URL : https://patchwork.freedesktop.org/series/52951/
State : failure
== Summary ==
Applying: lib: Use drm_get_param where it is applicable
Applying: tests: Use drm_get_param where applicable
Applying: lib: Use drm_get_param where it is applicable
Using index info to reconstruct a base tree...
M lib/drmtest.c
M lib/i915/gem_scheduler.c
M lib/i915/gem_submission.c
M lib/igt_gt.c
M lib/intel_chipset.c
M lib/ioctl_wrappers.c
Falling back to patching base and 3-way merge...
Auto-merging lib/i915/gem_submission.c
CONFLICT (content): Merge conflict in lib/i915/gem_submission.c
Auto-merging lib/i915/gem_scheduler.c
CONFLICT (content): Merge conflict in lib/i915/gem_scheduler.c
Patch failed at 0003 lib: Use drm_get_param where it is applicable
Use 'git am --show-current-patch' to see the failed patch
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".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
prev parent reply other threads:[~2018-11-23 15:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 14:27 [igt-dev] [PATCH i-g-t 1/3] lib/ioctl_wrapper: Add i915_get_param helper Lukasz Kalamarz
2018-11-23 14:27 ` [igt-dev] [PATCH i-g-t 2/3] tests: Use drm_get_param where applicable Lukasz Kalamarz
2018-11-23 14:27 ` [igt-dev] [PATCH i-g-t 3/3] lib: Use drm_get_param where it is applicable Lukasz Kalamarz
2018-11-23 14:56 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/3] lib/ioctl_wrapper: Add i915_get_param helper Patchwork
2018-11-23 15:25 ` [igt-dev] [PATCH i-g-t v2 1/3] " Lukasz Kalamarz
2018-11-23 15:25 ` [igt-dev] [PATCH i-g-t v2 2/3] tests: Use drm_get_param where applicable Lukasz Kalamarz
2018-11-23 15:25 ` [igt-dev] [PATCH i-g-t v2 3/3] lib: Use drm_get_param where it is applicable Lukasz Kalamarz
2018-11-26 9:11 ` Katarzyna Dec
2018-11-26 6:18 ` [igt-dev] [PATCH i-g-t v2 1/3] lib/ioctl_wrapper: Add i915_get_param helper Katarzyna Dec
2018-11-26 12:58 ` Petri Latvala
2018-11-23 15:37 ` 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=20181123153700.3990.65569@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=lukasz.kalamarz@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