From: Patchwork <patchwork@emeril.freedesktop.org>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm: minimize drmP.h dependencies
Date: Sat, 26 Jan 2019 12:31:43 -0000 [thread overview]
Message-ID: <20190126123143.23524.14453@emeril.freedesktop.org> (raw)
In-Reply-To: <20190126122527.11647-1-sam@ravnborg.org>
== Series Details ==
Series: drm: minimize drmP.h dependencies
URL : https://patchwork.freedesktop.org/series/55776/
State : failure
== Summary ==
Applying: staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h
Applying: drm/i915: prepare for drmP.h removal from drm_modeset_helper.h
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.c
M drivers/gpu/drm/i915/intel_atomic.c
M drivers/gpu/drm/i915/intel_atomic_plane.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
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c
Auto-merging drivers/gpu/drm/i915/intel_atomic.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/i915: prepare for drmP.h removal from drm_modeset_helper.h
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-01-26 12:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-26 12:25 [PATCH v6 0/5] drm: minimize drmP.h dependencies Sam Ravnborg
2019-01-26 12:25 ` [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h Sam Ravnborg
2019-02-01 17:37 ` Daniel Vetter
2019-02-01 17:47 ` Greg Kroah-Hartman
2019-01-26 12:25 ` [PATCH v6 2/5] drm/i915: " Sam Ravnborg
2019-01-28 11:41 ` Jani Nikula
2019-01-26 12:25 ` [PATCH v6 3/5] drm/rcar-du: " Sam Ravnborg
2019-01-26 12:25 ` [PATCH v6 4/5] drm: " Sam Ravnborg
2019-01-26 12:25 ` [PATCH v6 5/5] drm: remove drmP.h " Sam Ravnborg
2019-01-26 12:31 ` Patchwork [this message]
2019-02-07 21:35 ` [PATCH v6 0/5] drm: minimize drmP.h dependencies Daniel Vetter
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=20190126123143.23524.14453@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sam@ravnborg.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox