Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing FAILURE_ http://dpdk.org/patch/153781 Test Status Summary: +--------------+------------------+ | Architecture | DPDK Unit Test | +--------------+------------------+ | x86_64 | FAILURE | +--------------+------------------+ | arm64 | FAILURE | +--------------+------------------+ Test environment (aarch64): Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1024-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (aarch64) | ^~~~~~~ [452/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -c ../drivers/common/cnxk/roc_cpt.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_cpt.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [453/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o -c ../drivers/common/cnxk/roc_hash.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_hash.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [454/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -c ../drivers/common/cnxk/roc_cpt_debug.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_cpt_debug.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [455/2526] Generating drivers/rte_bus_ifpga.pmd.c with a custom command [456/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o -c ../drivers/common/cnxk/roc_eswitch.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_eswitch.c:7: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [457/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o -c ../drivers/common/cnxk/roc_idev.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_idev.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [458/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -c ../drivers/common/cnxk/roc_dev.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_dev.c:11: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [459/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o -c ../drivers/common/cnxk/roc_dpi.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_dpi.c:10: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [460/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o -c ../drivers/common/cnxk/roc_ie_ot.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_ie_ot.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [461/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o -c ../drivers/common/cnxk/roc_irq.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_irq.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [462/2526] Compiling C object drivers/libtmp_rte_bus_pci.a.p/bus_pci_linux_pci_vfio.c.o [463/2526] Generating drivers/rte_bus_platform.pmd.c with a custom command [464/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o -c ../drivers/common/cnxk/roc_ie_ow.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_ie_ow.c:6: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [465/2526] Compiling C object drivers/libtmp_rte_bus_fslmc.a.p/bus_fslmc_fslmc_vfio.c.o [466/2526] Compiling C object lib/librte_ethdev.a.p/ethdev_rte_ethdev.c.o [467/2526] Compiling C object drivers/libtmp_rte_bus_fslmc.a.p/bus_fslmc_qbman_qbman_portal.c.o [468/2526] Compiling C object drivers/libtmp_rte_bus_dpaa.a.p/bus_dpaa_base_qbman_qman.c.o [469/2526] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_swx_pipeline_spec.c.o [470/2526] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_table_action.c.o [471/2526] Compiling C object lib/librte_vhost.a.p/vhost_vhost_crypto.c.o [472/2526] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_swx_pipeline.c.o [473/2526] Compiling C object lib/librte_vhost.a.p/vhost_virtio_net.c.o ninja: build stopped: subcommand failed. Could not rebuild /root/dpdk-ci/tools/dpdk/build Test build failed. FAILURE Test environment (x86_64): Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1024-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (x86_64) [454/2299] Compiling C object drivers/librte_bus_ifpga.a.p/meson-generated_.._rte_bus_ifpga.pmd.c.o [455/2299] Linking static target drivers/librte_bus_ifpga.a [456/2299] Compiling C object drivers/libtmp_rte_bus_fslmc.a.p/bus_fslmc_qbman_qbman_portal.c.o [457/2299] Linking static target drivers/libtmp_rte_bus_fslmc.a [458/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_vmbus_bufring.c.o [459/2299] Compiling C object drivers/libtmp_rte_bus_platform.a.p/bus_platform_platform.c.o [460/2299] Compiling C object drivers/libtmp_rte_bus_vdev.a.p/bus_vdev_vdev.c.o [461/2299] Linking static target drivers/libtmp_rte_bus_platform.a [462/2299] Linking static target drivers/libtmp_rte_bus_vdev.a [463/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_vmbus_common.c.o [464/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_vmbus_channel.c.o [465/2299] Compiling C object drivers/libtmp_rte_bus_pci.a.p/bus_pci_linux_pci_vfio.c.o [466/2299] Linking static target drivers/libtmp_rte_bus_pci.a [467/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_vmbus_common_uio.c.o [468/2299] Compiling C object drivers/libtmp_rte_bus_dpaa.a.p/bus_dpaa_base_qbman_qman.c.o [469/2299] Linking static target drivers/libtmp_rte_bus_dpaa.a [470/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_linux_vmbus_bus.c.o [471/2299] Generating drivers/rte_bus_fslmc.pmd.c with a custom command [472/2299] Generating drivers/rte_bus_vdev.pmd.c with a custom command [473/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o -c ../drivers/common/cnxk/roc_ae.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_ae.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [474/2299] Compiling C object drivers/librte_bus_fslmc.a.p/meson-generated_.._rte_bus_fslmc.pmd.c.o [475/2299] Compiling C object drivers/librte_bus_vdev.a.p/meson-generated_.._rte_bus_vdev.pmd.c.o [476/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o -c ../drivers/common/cnxk/roc_aes.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_aes.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [477/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_linux_vmbus_uio.c.o [478/2299] Generating drivers/rte_bus_platform.pmd.c with a custom command [479/2299] Generating drivers/rte_bus_pci.pmd.c with a custom command [480/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o -c ../drivers/common/cnxk/roc_bphy.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_bphy.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [481/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae_fpm_tables.c.o [482/2299] Generating drivers/rte_bus_dpaa.pmd.c with a custom command [483/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o -c ../drivers/common/cnxk/roc_bphy_irq.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_bphy_irq.c:11: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [484/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o -c ../drivers/common/cnxk/roc_bphy_cgx.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_bphy_cgx.c:7: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [485/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -c ../drivers/common/cnxk/roc_cpt.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_cpt.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [486/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -c ../drivers/common/cnxk/roc_dev.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_dev.c:11: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [487/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/common/cnxk -I../drivers/common/cnxk -Idrivers/bus/pci -I../drivers/bus/pci -Ilib/net -I../lib/net -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/pci -I../lib/pci -I../drivers/bus/pci/linux -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.common.cnxk -MD -MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -MF drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o.d -o drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -c ../drivers/common/cnxk/roc_cpt_debug.c In file included from ../drivers/common/cnxk/roc_api.h:92, from ../drivers/common/cnxk/roc_cpt_debug.c:5: ../drivers/common/cnxk/roc_cpt_sg.h:17:1: error: version control conflict marker in file 17 | <<<<<<< HEAD | ^~~~~~~ [488/2299] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_swx_pipeline.c.o [489/2299] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_table_action.c.o [490/2299] Compiling C object lib/librte_vhost.a.p/vhost_virtio_net.c.o ninja: build stopped: subcommand failed. Could not rebuild /root/dpdk-ci/tools/dpdk/build Test build failed. FAILURE