From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CA68746808 for ; Tue, 27 May 2025 21:01:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF694402AE; Tue, 27 May 2025 21:01:23 +0200 (CEST) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id DD9024028D for ; Tue, 27 May 2025 21:01:15 +0200 (CEST) Received: from ec2-52-49-224-164.eu-west-1.compute.amazonaws.com (unknown [10.122.5.122]) by dmx.alabs.net (Postfix) with ESMTP id 35FAB84760C for ; Tue, 27 May 2025 22:01:09 +0300 (IDT) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net 35FAB84760C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1748372469; bh=wDwxhhPHsUnMzX98K8nV0gt6azWsn8waGblOuWiSZZM=; h=Date:From:To:Subject:List-ID:From; b=WltcDSjIAMDK8Oc6R3VcUXWF1lwqAjFITOzfKY+Xwg8GabAhZcZtoCeUeL051UTm5 SvwmS4Hk6X6sLT8U2m4imu78EdGgLZ6/CXQLziTxA1XZx8xkFuCzjRL//jDkz20FzE 6bSJ4uxuSNjZAO8CrDi2ckW4aoMzJ7HrgiW1Sb2Y= Received: from ip-10-159-234-77.eu-west-1.compute.internal (swci-jnk-k2apps.alabs.net [10.159.234.77]) by ec2-52-49-224-164.eu-west-1.compute.amazonaws.com (Postfix) with ESMTP id 2E09F12AAC0 for ; Tue, 27 May 2025 22:01:09 +0300 (IDT) Date: Tue, 27 May 2025 22:01:09 +0300 (IDT) From: al-sw-devops@alabs.net To: test-report@dpdk.org Message-ID: <1619348098.28112.1748372469191@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw153772-153781 fixes and new features to cnxk crypto PMD MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_28111_1205741555.1748372469184" X-Jenkins-Job: Community-Fast-tests X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org ------=_Part_28111_1205741555.1748372469184 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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_cnx= k_roc_cpt.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -MF drivers/lib= tmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o.d -o drivers/libtmp_rte_com= mon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [453/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_hash.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o -MF drivers/li= btmp_rte_common_cnxk.a.p/common_cnxk_roc_hash.c.o.d -o drivers/libtmp_rte_c= ommon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [454/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_cpt_debug.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -MF drive= rs/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o.d -o drivers/li= btmp_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 m= arker 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_cnx= k_roc_eswitch.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_eswitch.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [457/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_idev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o -MF drivers/li= btmp_rte_common_cnxk.a.p/common_cnxk_roc_idev.c.o.d -o drivers/libtmp_rte_c= ommon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [458/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_dev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -MF drivers/lib= tmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o.d -o drivers/libtmp_rte_com= mon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [459/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_dpi.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o -MF drivers/lib= tmp_rte_common_cnxk.a.p/common_cnxk_roc_dpi.c.o.d -o drivers/libtmp_rte_com= mon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [460/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_ie_ot.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ot.c.o -MF drivers/l= ibtmp_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [461/2526] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_irq.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o -MF drivers/lib= tmp_rte_common_cnxk.a.p/common_cnxk_roc_irq.c.o.d -o drivers/libtmp_rte_com= mon_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 m= arker 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_cnx= k_roc_ie_ow.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=3Dneoverse-n1 -DALLOW_E= XPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of= -packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -MQ= drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ie_ow.c.o -MF drivers/l= ibtmp_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [465/2526] Compiling C object drivers/libtmp_rte_bus_fslmc.a.p/bus_fslmc_fs= lmc_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_qb= man_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_pipe= line_spec.c.o [470/2526] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_table_ac= tion.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_pipe= line.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_qb= man_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_vm= bus_bufring.c.o [459/2299] Compiling C object drivers/libtmp_rte_bus_platform.a.p/bus_platf= orm_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_vm= bus_common.c.o [464/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_vm= bus_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_vm= bus_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_li= nux_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_cnx= k_roc_ae.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o -MF drivers/li= btmp_rte_common_cnxk.a.p/common_cnxk_roc_ae.c.o.d -o drivers/libtmp_rte_com= mon_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 m= arker 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_cnx= k_roc_aes.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o -MF drivers/l= ibtmp_rte_common_cnxk.a.p/common_cnxk_roc_aes.c.o.d -o drivers/libtmp_rte_c= ommon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [477/2299] Compiling C object drivers/libtmp_rte_bus_vmbus.a.p/bus_vmbus_li= nux_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_cnx= k_roc_bphy.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.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_bph= y.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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [481/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_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_cnx= k_roc_bphy_irq.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o -MF driv= ers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_irq.c.o.d -o drivers/li= btmp_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [484/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_bphy_cgx.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o -MF driv= ers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_bphy_cgx.c.o.d -o drivers/li= btmp_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [485/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_cpt.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o -MF drivers/l= ibtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt.c.o.d -o drivers/libtmp_rte_c= ommon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [486/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_dev.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o -MF drivers/l= ibtmp_rte_common_cnxk.a.p/common_cnxk_roc_dev.c.o.d -o drivers/libtmp_rte_c= ommon_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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [487/2299] Compiling C object drivers/libtmp_rte_common_cnxk.a.p/common_cnx= k_roc_cpt_debug.c.o FAILED: drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o=20 cc -Idrivers/libtmp_rte_common_cnxk.a.p -Idrivers -I../drivers -Idrivers/co= mmon/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/met= er -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/linu= x/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/mem= pool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/security -I../lib/secu= rity -Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -fdiagnostic= s-color=3Dalways -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Wextra -std= =3Dc11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -W= format-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-protot= ypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare= -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-m= issing-field-initializers -D_GNU_SOURCE -fPIC -march=3Dnative -mrtm -DALLOW= _EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-= of-packed-member -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=3Dpmd.common.cnxk -MD -= MQ drivers/libtmp_rte_common_cnxk.a.p/common_cnxk_roc_cpt_debug.c.o -MF dri= vers/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/comm= on/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 m= arker in file 17 | <<<<<<< HEAD | ^~~~~~~ [488/2299] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_swx_pipe= line.c.o [489/2299] Compiling C object lib/librte_pipeline.a.p/pipeline_rte_table_ac= tion.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 ------=_Part_28111_1205741555.1748372469184--