[igt-dev] ✗ Fi.CI.BUILD: failure for Compression support for Lunarlake (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Thu Nov 16 04:23:46 UTC 2023
== Series Details ==
Series: Compression support for Lunarlake (rev2)
URL : https://patchwork.freedesktop.org/series/126254/
State : failure
== Summary ==
Applying: lib: add blt command properties for lunarlake
Applying: lib/intel_blt: Update calculation of ccs_size and size_of_ctrl_copy
Using index info to reconstruct a base tree...
M lib/intel_blt.c
M lib/intel_blt.h
Falling back to patching base and 3-way merge...
Auto-merging lib/intel_blt.h
Auto-merging lib/intel_blt.c
CONFLICT (content): Merge conflict in lib/intel_blt.c
Patch failed at 0002 lib/intel_blt: Update calculation of ccs_size and size_of_ctrl_copy
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 igt-dev
mailing list