From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Nathan Schulte <nmschulte@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT: failure for series starting with [1/2,i915] add module param "force_dp_sst"
Date: Fri, 11 Mar 2016 10:47:31 +0200 [thread overview]
Message-ID: <1457686051.7544.1.camel@linux.intel.com> (raw)
In-Reply-To: <20160311074038.21373.58690@emeril.freedesktop.org>
Hi,
The series seems to be against rather old source tree.
Please do rebase all patches against drm-intel-nightly prior to
submitting.
Regards, Joonas
On pe, 2016-03-11 at 07:40 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [1/2,i915] add module param "force_dp_sst"
> URL : https://patchwork.freedesktop.org/series/4332/
> State : failure
>
> == Summary ==
>
> Series 4332v1 Series without cover letter
> 2016-03-10T23:22:05.996999 http://patchwork.freedesktop.org/api/1.0/series/4332/revisions/1/mbox/
> Applying: add module param "force_dp_sst"
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/i915_drv.h
> M drivers/gpu/drm/i915/i915_params.c
> M drivers/gpu/drm/i915/intel_dp.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_dp.c
> Auto-merging drivers/gpu/drm/i915/i915_params.c
> Auto-merging drivers/gpu/drm/i915/i915_drv.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
> Patch failed at 0001 add module param "force_dp_sst"
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-03-11 8:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 23:43 i915: allow forcing SST on DisplayPort connectors Nathan Schulte
2016-03-10 23:43 ` [PATCH 1/2] [i915] add module param "force_dp_sst" Nathan Schulte
2016-03-11 13:45 ` Jani Nikula
2016-03-10 23:43 ` [PATCH 2/2] [i915] move bools to end of i915_params struct Nathan Schulte
2016-03-11 7:40 ` ✗ Fi.CI.BAT: failure for series starting with [1/2,i915] add module param "force_dp_sst" Patchwork
2016-03-11 8:47 ` Joonas Lahtinen [this message]
2016-03-14 16:36 ` [PATCH v2] i915: module param to disable DisplayPort MST Nathan Schulte
2016-03-14 16:36 ` [PATCH] [i915] add module param "enable_dp_mst" Nathan Schulte
2016-03-15 8:43 ` Daniel Vetter
2016-03-15 15:14 ` [PATCH v3] drm/i915: " Nathan Schulte
2016-03-16 15:40 ` 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=1457686051.7544.1.camel@linux.intel.com \
--to=joonas.lahtinen@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nmschulte@gmail.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