[Intel-xe] ✗ CI.Patch_applied: failure for drm/xe/RAS: Count SOC and SGUNIT errors

[Patchwork]

== Series Details ==

Series: drm/xe/RAS: Count SOC and SGUNIT errors
URL   : https://patchwork.freedesktop.org/series/115233/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
commit 8f6c3eaf3f9daab25b31e80c8ba277877fd10547
Author:     Mauro Carvalho Chehab <mchehab at kernel.org>
AuthorDate: Fri Mar 10 09:13:39 2023 +0100
Commit:     Lucas De Marchi <lucas.demarchi at intel.com>
CommitDate: Wed Mar 15 10:28:56 2023 -0700

    drm/xe/xe_uc_fw: Use firmware files from standard locations
    
    The GuC/HuC firmware files used by Xe drivers are the same as
    used by i915. Use the already-known location to find those
    firmware files, for a couple of reasons:
    
    1. Avoid having the same firmware placed on two different
       places on MODULE_FIRMWARE(), if both 915 and xe drivers
       are compiled;
    
    2. Having firmware files located on different locations may end
       creating bigger initramfs, as the same files will be copied
       twice my mkinitrd/dracut/...;
    
    3. this is the place where those firmware files are located at
       https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
       Upstream doesn't expect them to have on other places;
    
    4. When built with display support, DMC firmware will be
       loaded from i915/ directory. It is very confusing to have
       some firmware files on a different place for the same driver.
    
    Cc: Matthew Brost <matthew.brost at intel.com>
    Cc: Lucas de Marchi <lucas.demarchi at intel.com>
    Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
    Cc: Thomas Hellstrom <thomas.hellstrom at linux.intel.com>
    Cc: Daniel Vetter <daniel at ffwll.ch>
    Cc: David Airlie <airlied at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
    [ Mostly agree with the direction of "use the firmware blobs from
      upstream at their current location for these platforms". Previous
      directory was not wrong as the plan was to have it handled in the
      upstream firmware repo. For future platforms the location can be
      changed if the support is only in xe ]
    Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
    Link: https://lore.kernel.org/r/20230310081338.3275583-1-mauro.chehab@linux.intel.com
=== git am output follows ===
.git/rebase-apply/patch:594: trailing whitespace.
	
.git/rebase-apply/patch:597: trailing whitespace.
	
error: patch failed: drivers/gpu/drm/xe/regs/xe_regs.h:92
error: drivers/gpu/drm/xe/regs/xe_regs.h: patch does not apply
error: patch failed: drivers/gpu/drm/xe/xe_gt.c:606
error: drivers/gpu/drm/xe/xe_gt.c: patch does not apply
error: patch failed: drivers/gpu/drm/xe/xe_gt_types.h:66
error: drivers/gpu/drm/xe/xe_gt_types.h: patch does not apply
error: patch failed: drivers/gpu/drm/xe/xe_irq.c:639
error: drivers/gpu/drm/xe/xe_irq.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe/RAS: Count SOC and SGUNIT errors
Patch failed at 0001 drm/xe/RAS: Count SOC and SGUNIT errors
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".