== Series Details == Series: i915 PMU and engine busy stats (rev6) URL : https://patchwork.freedesktop.org/series/27488/ 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_pmu.o drivers/gpu/drm/i915/i915_pmu.c: In function ‘i915_pmu_register’: drivers/gpu/drm/i915/i915_pmu.c:750:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:752:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:754:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] struct intel_engine_cs *engine; ^~~~~~ drivers/gpu/drm/i915/i915_pmu.c:756:1: error: version control conflict marker in file >>>>>>> drm/i915: Gate engine stats collection with a static key ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:767:6: error: ‘ret’ undeclared (first use in this function) if (ret) ^~~ drivers/gpu/drm/i915/i915_pmu.c:767:6: note: each undeclared identifier is reported only once for each function it appears in drivers/gpu/drm/i915/i915_pmu.c: In function ‘i915_pmu_unregister’: drivers/gpu/drm/i915/i915_pmu.c:820:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:823:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:831:1: error: version control conflict marker in file >>>>>>> drm/i915: Gate engine stats collection with a static key ^~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:807:23: error: unused variable ‘id’ [-Werror=unused-variable] enum intel_engine_id id; ^~ drivers/gpu/drm/i915/i915_pmu.c:806:26: error: unused variable ‘engine’ [-Werror=unused-variable] struct intel_engine_cs *engine; ^~~~~~ At top level: drivers/gpu/drm/i915/i915_pmu.c:715:12: error: ‘i915_pmu_cpu_offline’ defined but not used [-Werror=unused-function] static int i915_pmu_cpu_offline(unsigned int cpu, struct hlist_node *node) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/i915_pmu.c:703:12: error: ‘i915_pmu_cpu_online’ defined but not used [-Werror=unused-function] static int i915_pmu_cpu_online(unsigned int cpu, struct hlist_node *node) ^~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_pmu.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_pmu.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
