All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT:  failure for drm/i915: Implement HDCP (rev3)
Date: Tue, 5 Dec 2017 16:30:30 +0100	[thread overview]
Message-ID: <20171205153030.nm6mhqmfuntniitc@phenom.ffwll.local> (raw)
In-Reply-To: <20171205052125.17980.54587@emeril.freedesktop.org>

On Tue, Dec 05, 2017 at 05:21:25AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Implement HDCP (rev3)
> URL   : https://patchwork.freedesktop.org/series/34671/
> State : failure
> 
> == Summary ==
> 
> Applying: drm: Fix link-status kerneldoc line lengths
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/drm_connector.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/drm_connector.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
> Patch failed at 0001 drm: Fix link-status kerneldoc line lengths
> The copy of the patch that failed is found in: .git/rebase-apply/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".

You need to rebase onto drm-tip to appease CI.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2017-12-05 15:30 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-05  5:14 [PATCH v3 0/9] drm/i915: Implement HDCP Sean Paul
2017-12-05  5:14 ` Sean Paul
2017-12-05  5:15 ` [PATCH v3 1/9] drm: Fix link-status kerneldoc line lengths Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05  5:15 ` [PATCH v3 2/9] drm/i915: Add more control to wait_for routines Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05 17:13   ` Daniel Vetter
2017-12-05 17:13     ` Daniel Vetter
2017-12-05 23:09   ` [Intel-gfx] " Chris Wilson
2017-12-05  5:15 ` [PATCH v3 3/9] drm: Add Content Protection property Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05  8:07   ` Hans Verkuil
2017-12-05  8:07     ` Hans Verkuil
2017-12-05 14:04     ` Ramalingam C
2017-12-05 14:36       ` Sean Paul
2017-12-05 16:10         ` Hans Verkuil
2017-12-05 17:11         ` C, Ramalingam
2017-12-06 16:26           ` Sean Paul
2017-12-07  4:34             ` Ramalingam C
2017-12-05 15:27     ` [Intel-gfx] " Daniel Vetter
2017-12-05 15:27       ` Daniel Vetter
2017-12-05 15:34   ` Daniel Vetter
2017-12-05 15:34     ` Daniel Vetter
2017-12-05 15:40     ` [Intel-gfx] " Chris Wilson
2017-12-05 15:40       ` Chris Wilson
2017-12-05  5:15 ` [PATCH v3 4/9] drm: Add some HDCP related #defines Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05 23:12   ` [Intel-gfx] " Chris Wilson
2017-12-06 15:01     ` Alex Deucher
2017-12-06 15:01       ` Alex Deucher
2017-12-05  5:15 ` [PATCH v3 5/9] drm/i915: Add HDCP framework + base implementation Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05  9:06   ` Ramalingam C
2017-12-05  9:06     ` Ramalingam C
2017-12-05 17:00   ` Daniel Vetter
2017-12-05 17:00     ` Daniel Vetter
2017-12-05  5:15 ` [PATCH v3 6/9] drm/i915: Make use of indexed write GMBUS feature Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05 17:01   ` [Intel-gfx] " Daniel Vetter
2017-12-05 17:33   ` Ville Syrjälä
2017-12-05 17:33     ` Ville Syrjälä
2017-12-05  5:15 ` [PATCH v3 7/9] drm/i915: Add function to output Aksv over GMBUS Sean Paul
2017-12-05  5:15   ` Sean Paul
2017-12-05 17:02   ` [Intel-gfx] " Daniel Vetter
2017-12-05 17:02     ` Daniel Vetter
2017-12-05  5:15 ` [PATCH v3 8/9] drm/i915: Implement HDCP for HDMI Sean Paul
2017-12-05 17:06   ` Daniel Vetter
2017-12-05 17:06     ` Daniel Vetter
2017-12-05  5:15 ` [PATCH v3 9/9] drm/i915: Implement HDCP for DisplayPort Sean Paul
2017-12-05 14:30   ` Ramalingam C
2017-12-05 14:30     ` Ramalingam C
2017-12-05 17:12   ` Daniel Vetter
2017-12-05 17:12     ` Daniel Vetter
2017-12-05  5:21 ` ✗ Fi.CI.BAT: failure for drm/i915: Implement HDCP (rev3) Patchwork
2017-12-05 15:30   ` Daniel Vetter [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=20171205153030.nm6mhqmfuntniitc@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --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.