== Series Details == Series: series starting with [01/10] drm/i915/guc: Create intel_guc.c for defining GuC specific functionality (rev2) URL : https://patchwork.freedesktop.org/series/30486/ State : failure == Summary == CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/intel_uc.o drivers/gpu/drm/i915/intel_uc.c: In function ‘intel_uc_system_suspend’: drivers/gpu/drm/i915/intel_uc.c:441:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_uc.c:444:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_uc.c:452:1: error: version control conflict marker in file >>>>>>> drm/i915/guc: Update GuC suspend functionality in intel_uc_suspend path ^~~~~~~ scripts/Makefile.build:311: recipe for target 'drivers/gpu/drm/i915/intel_uc.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_uc.o] Error 1 scripts/Makefile.build:570: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:570: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:570: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 Makefile:1019: recipe for target 'drivers' failed make: *** [drivers] Error 2 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
