[igt-dev] ✗ Fi.CI.BAT: failure for tests/pm_backlight.c : Brightness test with DPMS and System suspend.
Patchwork
patchwork at emeril.freedesktop.org
Tue Aug 21 07:18:46 UTC 2018
== Series Details ==
Series: tests/pm_backlight.c : Brightness test with DPMS and System suspend.
URL : https://patchwork.freedesktop.org/series/48480/
State : failure
== Summary ==
Applying: tests/pm_backlight.c : Brightness test with DPMS and System suspend.
Using index info to reconstruct a base tree...
M tests/pm_backlight.c
Falling back to patching base and 3-way merge...
Auto-merging tests/pm_backlight.c
CONFLICT (content): Merge conflict in tests/pm_backlight.c
Patch failed at 0001 tests/pm_backlight.c : Brightness test with DPMS and System suspend.
Use 'git am --show-current-patch' to see the failed 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".
More information about the igt-dev
mailing list