[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Allow user to override PWM backlight frequency and duty cycle

[gnidorah at ya.ru]

What branch CI tests against?
I've created the patch against current torvalds/linux

16.01.2018, 17:42, "Patchwork" <patchwork at emeril.freedesktop.org>:
> == Series Details ==
>
> Series: drm/i915: Allow user to override PWM backlight frequency and duty cycle
> URL : https://patchwork.freedesktop.org/series/36540/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Allow user to override PWM backlight frequency and duty cycle
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/i915_params.c
> M drivers/gpu/drm/i915/i915_params.h
> M drivers/gpu/drm/i915/intel_panel.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_panel.c
> Auto-merging drivers/gpu/drm/i915/i915_params.h
> Auto-merging drivers/gpu/drm/i915/i915_params.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_params.c
> Patch failed at 0001 drm/i915: Allow user to override PWM backlight frequency and duty cycle
> 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".