[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/kms: Stop registering multiple /sys/class/backlight devs for a single display
Patchwork
patchwork at emeril.freedesktop.org
Tue May 17 19:03:25 UTC 2022
== Series Details ==
Series: drm/kms: Stop registering multiple /sys/class/backlight devs for a single display
URL : https://patchwork.freedesktop.org/series/104084/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/104084/revisions/1/mbox/ not applied
Applying: ACPI: video: Add a native function parameter to acpi_video_get_backlight_type()
Applying: drm/i915: Don't register backlight when another backlight should be used
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_backlight.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c
Applying: drm/amdgpu: Don't register backlight when another backlight should be used
Using index info to reconstruct a base tree...
M drivers/gpu/drm/Kconfig
M drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
Auto-merging drivers/gpu/drm/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/amdgpu: Don't register backlight when another backlight should be used
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 Intel-gfx
mailing list