== Series Details == Series: drm/i915: Skylake plane update/disable unifications [v3] URL : https://patchwork.freedesktop.org/series/30122/ 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/i915_drv.o In file included from drivers/gpu/drm/i915/i915_trace.h:10:0, from drivers/gpu/drm/i915/i915_drv.h:3194, from drivers/gpu/drm/i915/i915_drv.c:49: drivers/gpu/drm/i915/intel_drv.h:1913:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_drv.h:1916:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_drv.h:1918:6: error: conflicting types for ‘intel_pipe_update_end’ void intel_pipe_update_end(struct intel_crtc *crtc); ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_drv.h:1915:6: note: previous declaration of ‘intel_pipe_update_end’ was here void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_drv.h:1922:1: error: version control conflict marker in file >>>>>>> drm/i915: Unify skylake plane update ^~~~~~~ scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_drv.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_drv.o] Error 1 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:561: 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
