CC [M] drivers/hid/usbhid/hid-core.o CC net/ipv4/fib_semantics.o In file included from drivers/gpu/drm/i915/intel_workarounds.c:8:0: drivers/gpu/drm/i915/intel_workarounds.h:10:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.h:17:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.h:20:1: error: version control conflict marker in file >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.h:20:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘wa_ring_whitelist_reg’: drivers/gpu/drm/i915/intel_workarounds.c:118:31: error: ‘struct i915_workarounds’ has no member named ‘hw_whitelist_count’ const unsigned int index = wa->hw_whitelist_count[engine->id]; ^~ drivers/gpu/drm/i915/intel_workarounds.c:125:4: error: ‘struct i915_workarounds’ has no member named ‘hw_whitelist_count’ wa->hw_whitelist_count[engine->id]++; ^~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘gen8_init_workarounds’: drivers/gpu/drm/i915/intel_workarounds.c:102:33: error: implicit declaration of function ‘wa_add’; did you mean ‘d_add’? [-Werror=implicit-function-declaration] #define WA_REG(addr, mask, val) wa_add(dev_priv, (addr), (mask), (val)) ^ drivers/gpu/drm/i915/intel_workarounds.c:105:2: note: in expansion of macro ‘WA_REG’ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask)) ^~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:134:2: note: in expansion of macro ‘WA_SET_BIT_MASKED’ WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING); ^~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘gen9_init_workarounds’: drivers/gpu/drm/i915/intel_workarounds.c:362:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:366:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:383:1: error: version control conflict marker in file >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:383:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: At top level: drivers/gpu/drm/i915/intel_workarounds.c:549:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_init’: drivers/gpu/drm/i915/intel_workarounds.c:596:9: error: implicit declaration of function ‘bdw_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = bdw_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:598:9: error: implicit declaration of function ‘chv_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = chv_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:600:9: error: implicit declaration of function ‘skl_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = skl_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:602:9: error: implicit declaration of function ‘bxt_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = bxt_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:604:9: error: implicit declaration of function ‘kbl_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = kbl_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:606:9: error: implicit declaration of function ‘glk_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = glk_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:608:9: error: implicit declaration of function ‘cfl_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = cfl_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:610:9: error: implicit declaration of function ‘cnl_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = cnl_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c:612:9: error: implicit declaration of function ‘icl_ctx_workarounds_init’; did you mean ‘intel_ctx_workarounds_init’? [-Werror=implicit-function-declaration] err = icl_ctx_workarounds_init(dev_priv); ^~~~~~~~~~~~~~~~~~~~~~~~ intel_ctx_workarounds_init drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:648:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:653:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:706:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:801:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:939:34: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:939:13: error: invalid storage class for function ‘whitelist_reg’ static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~~~~~ In file included from ./include/linux/kernel.h:15:0, from ./include/asm-generic/bug.h:18, from ./arch/x86/include/asm/bug.h:47, from ./include/linux/bug.h:5, from ./include/linux/mmdebug.h:5, from ./include/linux/gfp.h:5, from ./include/linux/slab.h:15, from ./include/linux/io-mapping.h:22, from drivers/gpu/drm/i915/i915_drv.h:36, from drivers/gpu/drm/i915/intel_workarounds.c:7: drivers/gpu/drm/i915/intel_workarounds.c: In function ‘whitelist_reg’: drivers/gpu/drm/i915/intel_workarounds.c:941:19: error: dereferencing pointer to incomplete type ‘struct whitelist’ if (GEM_WARN_ON(w->count >= RING_MAX_NONPRIV_SLOTS)) ^ ./include/linux/build_bug.h:36:63: note: in definition of macro ‘BUILD_BUG_ON_INVALID’ #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e)))) ^ drivers/gpu/drm/i915/intel_workarounds.c:941:6: note: in expansion of macro ‘GEM_WARN_ON’ if (GEM_WARN_ON(w->count >= RING_MAX_NONPRIV_SLOTS)) ^~~~~~~~~~~ In file included from drivers/gpu/drm/i915/i915_request.h:30:0, from drivers/gpu/drm/i915/intel_ringbuffer.h:14, from drivers/gpu/drm/i915/intel_lrc.h:27, from drivers/gpu/drm/i915/i915_drv.h:65, from drivers/gpu/drm/i915/intel_workarounds.c:7: drivers/gpu/drm/i915/i915_gem.h:56:54: warning: left-hand operand of comma expression has no effect [-Wunused-value] #define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0) ^ drivers/gpu/drm/i915/intel_workarounds.c:941:6: note: in expansion of macro ‘GEM_WARN_ON’ if (GEM_WARN_ON(w->count >= RING_MAX_NONPRIV_SLOTS)) ^~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:939:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:947:40: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void bdw_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:947:13: error: invalid storage class for function ‘bdw_whitelist_build’ static void bdw_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:951:40: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void chv_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:951:13: error: invalid storage class for function ‘chv_whitelist_build’ static void chv_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:955:41: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void gen9_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:955:13: error: invalid storage class for function ‘gen9_whitelist_build’ static void gen9_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘gen9_whitelist_build’: drivers/gpu/drm/i915/intel_workarounds.c:958:16: error: passing argument 1 of ‘whitelist_reg’ from incompatible pointer type [-Werror=incompatible-pointer-types] whitelist_reg(w, GEN9_CTX_PREEMPT_REG); ^ drivers/gpu/drm/i915/intel_workarounds.c:939:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:961:16: error: passing argument 1 of ‘whitelist_reg’ from incompatible pointer type [-Werror=incompatible-pointer-types] whitelist_reg(w, GEN8_CS_CHICKEN1); ^ drivers/gpu/drm/i915/intel_workarounds.c:939:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:964:16: error: passing argument 1 of ‘whitelist_reg’ from incompatible pointer type [-Werror=incompatible-pointer-types] whitelist_reg(w, GEN8_HDC_CHICKEN1); ^ drivers/gpu/drm/i915/intel_workarounds.c:939:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:967:40: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void skl_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:967:13: error: invalid storage class for function ‘skl_whitelist_build’ static void skl_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘skl_whitelist_build’: drivers/gpu/drm/i915/intel_workarounds.c:969:23: error: passing argument 1 of ‘gen9_whitelist_build’ from incompatible pointer type [-Werror=incompatible-pointer-types] gen9_whitelist_build(w); ^ drivers/gpu/drm/i915/intel_workarounds.c:955:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void gen9_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:972:16: error: passing argument 1 of ‘whitelist_reg’ from incompatible pointer type [-Werror=incompatible-pointer-types] whitelist_reg(w, GEN8_L3SQCREG4); ^ drivers/gpu/drm/i915/intel_workarounds.c:939:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void whitelist_reg(struct whitelist *w, i915_reg_t reg) ^~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:975:40: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void bxt_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:975:13: error: invalid storage class for function ‘bxt_whitelist_build’ static void bxt_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘bxt_whitelist_build’: drivers/gpu/drm/i915/intel_workarounds.c:977:23: error: passing argument 1 of ‘gen9_whitelist_build’ from incompatible pointer type [-Werror=incompatible-pointer-types] gen9_whitelist_build(w); ^ drivers/gpu/drm/i915/intel_workarounds.c:955:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void gen9_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:980:40: warning: ‘struct whitelist’ declared inside parameter list will not be visible outside of this definition or declaration static void kbl_whitelist_build(struct whitelist *w) ^~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:980:13: error: invalid storage class for function ‘kbl_whitelist_build’ static void kbl_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘kbl_whitelist_build’: drivers/gpu/drm/i915/intel_workarounds.c:982:23: error: passing argument 1 of ‘gen9_whitelist_build’ from incompatible pointer type [-Werror=incompatible-pointer-types] gen9_whitelist_build(w); ^ drivers/gpu/drm/i915/intel_workarounds.c:955:13: note: expected ‘struct whitelist *’ but argument is of type ‘struct whitelist *’ static void gen9_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:983:1: error: version control conflict marker in file ======= ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:984:42: error: expected statement before ‘)’ token GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); ^ drivers/gpu/drm/i915/intel_workarounds.c:985:1: error: version control conflict marker in file >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:985:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c: In function ‘intel_ctx_workarounds_emit’: drivers/gpu/drm/i915/intel_workarounds.c:991:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:1098:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:1194:19: error: invalid suffix "b449d5c82a..." on integer constant >>>>>>> parent of 59b449d5c82a... drm/i915: Split out functions for different kinds of workarounds ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:1206:0: error: expected declaration or statement at end of input #endif drivers/gpu/drm/i915/intel_workarounds.c:1206:0: warning: control reaches end of non-void function [-Wreturn-type] #endif At top level: drivers/gpu/drm/i915/intel_workarounds.c:980:13: warning: ‘kbl_whitelist_build’ defined but not used [-Wunused-function] static void kbl_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:975:13: warning: ‘bxt_whitelist_build’ defined but not used [-Wunused-function] static void bxt_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:967:13: warning: ‘skl_whitelist_build’ defined but not used [-Wunused-function] static void skl_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:951:13: warning: ‘chv_whitelist_build’ defined but not used [-Wunused-function] static void chv_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:947:13: warning: ‘bdw_whitelist_build’ defined but not used [-Wunused-function] static void bdw_whitelist_build(struct whitelist *w) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:489:12: warning: ‘cnl_init_workarounds’ defined but not used [-Wunused-function] static int cnl_init_workarounds(struct intel_engine_cs *engine) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:460:12: warning: ‘bxt_init_workarounds’ defined but not used [-Wunused-function] static int bxt_init_workarounds(struct intel_engine_cs *engine) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:429:12: warning: ‘skl_init_workarounds’ defined but not used [-Wunused-function] static int skl_init_workarounds(struct intel_engine_cs *engine) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:213:12: warning: ‘chv_init_workarounds’ defined but not used [-Wunused-function] static int chv_init_workarounds(struct intel_engine_cs *engine) ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_workarounds.c:181:12: warning: ‘bdw_init_workarounds’ defined but not used [-Wunused-function] static int bdw_init_workarounds(struct intel_engine_cs *engine) ^~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors scripts/Makefile.build:293: recipe for target 'drivers/gpu/drm/i915/intel_workarounds.o' failed make[7]: *** [drivers/gpu/drm/i915/intel_workarounds.o] Error 1 scripts/Makefile.build:518: recipe for target 'drivers/gpu/drm/i915' failed make[6]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:518: recipe for target 'drivers/gpu/drm' failed make[5]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:518: recipe for target 'drivers/gpu' failed make[4]: *** [drivers/gpu] Error 2