[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Add HWMON support (rev4)

[Patchwork]

== Series Details ==

Series: drm/i915: Add HWMON support (rev4)
URL   : https://patchwork.freedesktop.org/series/104278/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/104278/revisions/4/mbox/ not applied
Applying: drm/i915/hwmon: Add HWMON infrastructure
Applying: drm/i915/hwmon: Add HWMON current voltage support
Applying: drm/i915/hwmon: Power PL1 limit and TDP setting
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_reg.h
M	drivers/gpu/drm/i915/intel_mchbar_regs.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_mchbar_regs.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_mchbar_regs.h
Auto-merging drivers/gpu/drm/i915/i915_reg.h
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/i915/hwmon: Power PL1 limit and TDP setting
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".