✗ Fi.CI.BUILD: failure for DG2 enabling

[Patchwork]

== Series Details ==

Series: DG2 enabling
URL   : https://patchwork.freedesktop.org/series/100264/
State : failure

== Summary ==

Applying: drm/i915/guc: Add fetch of hwconfig table
Applying: drm/i915/uapi: Add query for hwconfig table
Applying: drm/i915/dg2: Define GuC firmware version for DG2
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/dg2: Add DG2 PCI IDs
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_pci.c
M	drivers/gpu/drm/i915/intel_device_info.c
M	include/drm/i915_pciids.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/i915_pciids.h
CONFLICT (content): Merge conflict in include/drm/i915_pciids.h
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c
Patch failed at 0004 drm/i915/dg2: Add DG2 PCI IDs
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".