RE: ✗ Fi.CI.BUILD: failure for Add WildCat Lake support

[Bhadane, Dnyaneshwar]

> -----Original Message-----
> From: Patchwork <patchwork at emeril.freedesktop.org>
> Sent: Wednesday, June 11, 2025 10:15 PM
> To: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane at intel.com>
> Cc: intel-gfx at lists.freedesktop.org
> Subject: ✗ Fi.CI.BUILD: failure for Add WildCat Lake support
> 
> == Series Details ==
> 
> Series: Add WildCat Lake support
> URL   : https://patchwork.freedesktop.org/series/150101/
> State : failure
> 
> == Summary ==
> 
> Error: patch
> https://patchwork.freedesktop.org/api/1.0/series/150101/revisions/1/mbox/
> not applied
> Applying: drm/i915/xe3lpd: Add support for display version 30.02
> Applying: drm/xe/xe3: Add support for graphics IP version 30.03 Using index
> info to reconstruct a base tree...
> M	drivers/gpu/drm/xe/xe_pci.c
> M	drivers/gpu/drm/xe/xe_wa.c
> M	drivers/gpu/drm/xe/xe_wa_oob.rules
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/xe/xe_wa_oob.rules
> CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa_oob.rules
Looks like some there are still ahead in the branch than drm-xe-next,
I will figure out and send updated conflict free patches for intel-gfx list.

Dnyaneshwar,

> Auto-merging drivers/gpu/drm/xe/xe_wa.c
> Auto-merging drivers/gpu/drm/xe/xe_pci.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed
> at 0002 drm/xe/xe3: Add support for graphics IP version 30.03 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".
> Build failed, no error log produced
>