== 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
