== Series Details == Series: HuC/GuC status to Get Params. (rev2) URL : https://patchwork.freedesktop.org/series/11158/ State : failure == Summary == Applying: drm/i915/get_params: Add GuC status to getparams Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/intel_guc.h M drivers/gpu/drm/i915/intel_guc_loader.c M include/uapi/drm/i915_drm.h .git/rebase-apply/patch:67: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h Auto-merging drivers/gpu/drm/i915/intel_guc_loader.c Auto-merging drivers/gpu/drm/i915/intel_guc.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Applying: drm/i915/get_params: Add HuC status to getparams Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c A drivers/gpu/drm/i915/intel_huc.h A drivers/gpu/drm/i915/intel_huc_loader.c M include/uapi/drm/i915_drm.h .git/rebase-apply/patch:67: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_huc_loader.c deleted in 8fdda9ee12a65129403945bc0578330c33760571 and modified in drm/i915/get_params: Add HuC status to getparams. Version drm/i915/get_params: Add HuC status to getparams of drivers/gpu/drm/i915/intel_huc_loader.c left in tree. Auto-merging drivers/gpu/drm/i915/i915_gem.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.h Auto-merging drivers/gpu/drm/i915/i915_drv.c error: Failed to merge in the changes. Patch failed at 0002 drm/i915/get_params: Add HuC status to getparams The copy of the patch that failed is found in: .git/rebase-apply/patch 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
