From: gnidorah@ya.ru
To: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: Re: ✗ Fi.CI.BAT: failure for drm/i915: Allow user to override PWM backlight frequency and duty cycle
Date: Tue, 16 Jan 2018 18:36:12 +0300 [thread overview]
Message-ID: <1311561516116972@web23j.yandex.ru> (raw)
In-Reply-To: <20180116144149.20253.38320@emeril.freedesktop.org>
What branch CI tests against?
I've created the patch against current torvalds/linux
16.01.2018, 17:42, "Patchwork" <patchwork@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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-01-16 15:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 13:40 [PATCH] drm/i915: Allow user to override PWM backlight frequency and duty cycle Alex Ivanov
2018-01-16 14:41 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-01-16 15:36 ` gnidorah [this message]
2018-01-16 19:26 ` Saarinen, Jani
2018-01-17 7:22 ` [PATCH] " Alex Ivanov
2018-01-17 7:46 ` ✓ Fi.CI.BAT: success for drm/i915: Allow user to override PWM backlight frequency and duty cycle (rev2) Patchwork
2018-01-17 8:59 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-01-17 13:12 ` [PATCH] drm/i915: Allow user to override PWM backlight frequency and duty cycle Jani Nikula
2018-01-17 17:49 ` Alex Ivanov
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=1311561516116972@web23j.yandex.ru \
--to=gnidorah@ya.ru \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox