From: Patchwork <patchwork@emeril.freedesktop.org>
To: Vivek Kasireddy <vivek.kasireddy@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915/ehl: Add support for DPLL4 (v5)
Date: Wed, 05 Jun 2019 19:05:56 -0000 [thread overview]
Message-ID: <20190605190556.10842.99420@emeril.freedesktop.org> (raw)
In-Reply-To: <20190605184128.4602-1-vivek.kasireddy@intel.com>
== Series Details ==
Series: drm/i915/ehl: Add support for DPLL4 (v5)
URL : https://patchwork.freedesktop.org/series/61684/
State : failure
== Summary ==
Applying: drm/i915/ehl: Add support for DPLL4 (v5)
.git/rebase-apply/patch:146: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_dpll_mgr.c
M drivers/gpu/drm/i915/intel_dpll_mgr.h
M drivers/gpu/drm/i915/intel_runtime_pm.c
M drivers/gpu/drm/i915/intel_runtime_pm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.h
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.h
Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/ehl: Add support for DPLL4 (v5)
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
next prev parent reply other threads:[~2019-06-05 19:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 18:41 [PATCH] drm/i915/ehl: Add support for DPLL4 (v5) Vivek Kasireddy
2019-06-05 19:05 ` Patchwork [this message]
2019-06-06 0:23 ` [PATCH] drm/i915/ehl: Add support for DPLL4 (v6) Vivek Kasireddy
2019-06-06 0:37 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-06-06 9:22 ` [PATCH] drm/i915/ehl: Add support for DPLL4 (v5) Imre Deak
2019-06-07 23:23 ` [PATCH] drm/i915/ehl: Add support for DPLL4 (v7) Vivek Kasireddy
2019-06-14 0:19 ` Souza, Jose
2019-06-14 19:22 ` Ville Syrjälä
2019-06-19 12:47 ` Imre Deak
2019-06-22 2:00 ` [PATCH] drm/i915/ehl: Add support for DPLL4 (v8) Vivek Kasireddy
2019-06-27 0:14 ` Souza, Jose
2019-06-27 12:51 ` Ville Syrjälä
2019-06-28 0:00 ` [PATCH] drm/i915/ehl: Add support for DPLL4 (v9) Vivek Kasireddy
2019-06-08 0:27 ` ✓ Fi.CI.BAT: success for drm/i915/ehl: Add support for DPLL4 (v5) (rev2) Patchwork
2019-06-10 14:48 ` ✓ Fi.CI.IGT: " Patchwork
2019-06-22 2:57 ` ✓ Fi.CI.BAT: success for drm/i915/ehl: Add support for DPLL4 (v5) (rev3) Patchwork
2019-06-22 9:55 ` ✓ Fi.CI.IGT: " Patchwork
2019-06-28 11:25 ` ✓ Fi.CI.BAT: success for drm/i915/ehl: Add support for DPLL4 (v5) (rev4) Patchwork
2019-06-28 20:20 ` ✓ Fi.CI.IGT: " Patchwork
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=20190605190556.10842.99420@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=vivek.kasireddy@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