* |FAILURE| dpdk-next-net-mlx| 2374f33e1d| Intel-compilation
@ 2025-10-16 8:15 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2025-10-16 8:15 UTC (permalink / raw)
To: test-report, thomas; +Cc: dpdk_sw_eng, npg.sw.core.tools.prc
[-- Attachment #1: Type: text/plain, Size: 126580 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
_Compilation issues_
commit 2374f33e1d964e100895fd294966380c46f0886d
Author: Shani Peretz <shperetz@nvidia.com>
Date: Thu Sep 18 08:43:25 2025 +0300
net/mlx5: fix MTU initialization in device spawn
DPDK git Repo: dpdk-next-net-mlx
Meson Build Summary: 25 Builds Done, 16 Successful, 9 Failures, 0 Blocked
+-------------------+------------+--------------+------------+------------+-----------+----------+------------+
| os | gcc-static | clang-static | icc-static | gcc-shared | gcc-debug | document | gcc-16byte |
+-------------------+------------+--------------+------------+------------+-----------+----------+------------+
| OpenAnolis8.10-64 | pass | | | | | | |
| FreeBSD14-64 | pass | pass | | pass | pass | | |
| RHEL96-64 | pass | pass | | pass | pass | | |
| SUSE15-64 | pass | pass | | | | | |
| AzureLinux3.0-64 | pass | | | | | | |
| UB2404-32 | pass | | | | | | |
| RHEL10-64 | pass | | | | | | |
| UB2404-64N | fail | | | fail | | | |
| UB2404-64 | fail | fail | | | | fail | fail |
| RHEL10-64RT | pass | | | | | | |
| UB2504-64 | fail | | | | | | |
| Fedora42-64 | fail | fail | | | | | |
| OpenEuler2404-64 | pass | | | | | | |
+-------------------+------------+--------------+------------+------------+-----------+----------+------------+
Comments:
Because of DPDK bug (https://bugs.dpdk.org/show_bug.cgi?id=928),
All the dpdk-next-* branch add `Ddisable_drivers=event/cnxk` option when build with ICC complier.
Test environment and configuration as below:
OS: OpenAnolis8.10-64
Kernel Version: 5.10.134-18.an8.x86_64
GCC Version: gcc (GCC) 8.5.0 20210514 (Anolis 8.5.0-24.0.1)
Clang Version: 18.1.8 (Red Hat 18.1.8-1.0.1.module+an8.9.0+11287+9d0292d3)
x86_64-native-linuxapp-gcc
OS: FreeBSD14-64
Kernel Version: 14.3-RELEASE
GCC Version: gcc (FreeBSD Ports Collection) 13.3.0
Clang Version: 19.1.7 (https://github.com/llvm/llvm-project.git llvmorg-19.1.7-0-gcd708029e0b2)
x86_64-native-bsdapp-gcc
x86_64-native-bsdapp-clang
x86_64-native-bsdapp-gcc+shared
x86_64-native-bsdapp-gcc+debug
OS: RHEL96-64
Kernel Version: 5.14.0-570.12.1.el9_6.x86_64
GCC Version: gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5)
Clang Version: 19.1.7 (Red Hat, Inc. 19.1.7-2.el9)
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
x86_64-native-linuxapp-gcc+shared
x86_64-native-linuxapp-gcc+debug
OS: SUSE15-64
Kernel Version: 6.4.0-150700.51-default
GCC Version: gcc (SUSE Linux) 14.2.0
Clang Version: 17.0.6
x86_64-native-linuxapp-clang
x86_64-native-linuxapp-gcc
OS: AzureLinux3.0-64
Kernel Version: 6.6.47.1-1.azl3
GCC Version: gcc (GCC) 13.2.0
Clang Version: 18.1.2
x86_64-native-linuxapp-gcc
OS: UB2404-32
Kernel Version: 6.8.0-41-generic
GCC Version: gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0
Clang Version: NA
i686-native-linuxapp-gcc
OS: RHEL10-64
Kernel Version: 6.12.0-55.9.1.el10_0.x86_64
GCC Version: gcc (GCC) 14.2.1 20250110 (Red Hat 14.2.1-7)
Clang Version: 19.1.7 (Red Hat, Inc. 19.1.7-2.el10)
x86_64-native-linuxapp-gcc
OS: UB2404-64N
Kernel Version: 6.10.8-061008-generic
GCC Version: gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0
Clang Version: NA
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-gcc+shared
OS: UB2404-64
Kernel Version: 6.8.0-41-generic
GCC Version: gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0
Clang Version: 18.1.3 (1ubuntu1)
x86_64-native-linuxapp-gcc+16byte
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
x86_64-native-linuxapp-doc
OS: RHEL10-64RT
Kernel Version: 6.12.0-55.9.1.el10_0.x86_64+rt
GCC Version: gcc (GCC) 14.2.1 20250110 (Red Hat 14.2.1-7)
Clang Version: 19.1.7 (Red Hat, Inc. 19.1.7-2.el10)
x86_64-native-linuxapp-gcc
OS: UB2504-64
Kernel Version: 6.14.0-15-generic
GCC Version: gcc (Ubuntu 14.2.0-19ubuntu2) 14.2.0
Clang Version: NA
x86_64-native-linuxapp-gcc
OS: Fedora42-64
Kernel Version: 6.14.0-63.fc42.x86_64
GCC Version: gcc (GCC) 15.0.1 20250329 (Red Hat 15.0.1-0)
Clang Version: 20.1.3 (Fedora 20.1.3-1.fc42)
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
OS: OpenEuler2404-64
Kernel Version: 6.6.0-98.0.0.103.oe2403sp2.x86_64
GCC Version: gcc (GCC) 12.3.1 (openEuler 12.3.1-98.oe2403sp2)
Clang Version: 17.0.6 ( 17.0.6-45.oe2403sp2)
x86_64-native-linuxapp-gcc
*Build Failed #1:
OS: UB2404-64N
Target: x86_64-native-linuxapp-gcc
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1021/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_ef10_nic.c.o
[1022/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford2_nic.c.o
[1025/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1026/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1027/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1028/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
ninja: build stopped
*Build Failed #2:
OS: UB2404-64N
Target: x86_64-native-linuxapp-gcc+shared
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1035/3647] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1036/3647] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1037/3647] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1038/3647] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1039/3647] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_intr.c.o
[1040/3647] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1041/3647] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1042/3647] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
[1043/3647] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_nic.c.o
ninja: build stopped
*Build Failed #3:
OS: UB2404-64
Target: x86_64-native-linuxapp-gcc+16byte
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -DRTE_LIBRTE_I40E_16BYTE_RX_DESC -DRTE_LIBRTE_ICE_16BYTE_RX_DESC -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1021/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -DRTE_LIBRTE_I40E_16BYTE_RX_DESC -DRTE_LIBRTE_ICE_16BYTE_RX_DESC -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1022/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -DRTE_LIBRTE_I40E_16BYTE_RX_DESC -DRTE_LIBRTE_ICE_16BYTE_RX_DESC -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -DRTE_LIBRTE_I40E_16BYTE_RX_DESC -DRTE_LIBRTE_ICE_16BYTE_RX_DESC -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_stats.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_stats.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -DRTE_LIBRTE_I40E_16BYTE_RX_DESC -DRTE_LIBRTE_ICE_16BYTE_RX_DESC -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_stats.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_stats.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_stats.c.o -c ../drivers/net/mlx5/mlx5_stats.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_stats.c:18:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1025/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1026/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1027/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_intr.c.o
[1028/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_nic.c.o
ninja: build stopped
*Build Failed #4:
OS: UB2404-64
Target: x86_64-native-linuxapp-gcc
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1021/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_ef10_nic.c.o
[1022/3803] Linking target drivers/librte_common_qat.so.26.0
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1025/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1026/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford2_nic.c.o
[1027/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1028/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
ninja: build stopped
*Build Failed #5:
OS: UB2404-64
Target: x86_64-native-linuxapp-clang
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5_rss.c:17:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1024/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1025/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5_rxmode.c:13:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1026/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1027/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5_rxq.c:29:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1028/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5_rxtx.c:24:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_intr.c.o
[1030/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
[1031/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_nic.c.o
ninja: build stopped
*Build Failed #6:
OS: UB2404-64
Target: x86_64-native-linuxapp-doc
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1019/3620] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_ef10_tx.c.o
[1020/3620] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_ef10_rx.c.o
[1021/3620] Linking target drivers/librte_common_qat.so.26.0
[1022/3620] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1023/3620] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3620] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1025/3620] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1026/3620] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford2_nic.c.o
[1027/3620] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ninja: build stopped
*Build Failed #7:
OS: UB2504-64
Target: x86_64-native-linuxapp-gcc
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1022/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford2_nic.c.o
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_ef10_nic.c.o
[1025/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1026/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1027/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1028/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix "b24e8f8617c4fc3f78636dcc30fa32f394773f" on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1030/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
ninja: build stopped
*Build Failed #8:
OS: Fedora42-64
Target: x86_64-native-linuxapp-gcc
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -fzero-init-padding-bits=all -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rss.c:17:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix ‘b24e8f8617c4fc3f78636dcc30fa32f394773f’ on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1021/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -fzero-init-padding-bits=all -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxmode.c:13:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix ‘b24e8f8617c4fc3f78636dcc30fa32f394773f’ on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1022/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -fzero-init-padding-bits=all -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix ‘b24e8f8617c4fc3f78636dcc30fa32f394773f’ on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1023/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -fzero-init-padding-bits=all -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxtx.c:24:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix ‘b24e8f8617c4fc3f78636dcc30fa32f394773f’ on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1024/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
gcc -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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 -fzero-init-padding-bits=all -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5.h:36,
from ../drivers/net/mlx5/mlx5_rxq.c:29:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^~~~~~~
../drivers/net/mlx5/rte_pmd_mlx5.h:13:9: error: invalid suffix ‘b24e8f8617c4fc3f78636dcc30fa32f394773f’ on integer constant
13 | >>>>>>> 73b24e8f8617c4fc3f78636dcc30fa32f394773f
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[1025/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1026/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1027/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
[1028/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_intr.c.o
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_nic.c.o
ninja: build stopped
*Build Failed #9:
OS: Fedora42-64
Target: x86_64-native-linuxapp-clang
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rss.c.o -c ../drivers/net/mlx5/mlx5_rss.c
In file included from ../drivers/net/mlx5/mlx5_rss.c:17:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1022/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rx.c.o -c ../drivers/net/mlx5/mlx5_rx.c
In file included from ../drivers/net/mlx5/mlx5_rx.c:23:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1023/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_mac.c.o
[1024/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxtx.c.o -c ../drivers/net/mlx5/mlx5_rxtx.c
In file included from ../drivers/net/mlx5/mlx5_rxtx.c:24:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1025/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_medford4_phy.c.o
[1026/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxmode.c.o -c ../drivers/net/mlx5/mlx5_rxmode.c
In file included from ../drivers/net/mlx5/mlx5_rxmode.c:13:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1027/3803] Compiling C object drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
FAILED: drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o
clang -Idrivers/libtmp_rte_net_mlx5.a.p -Idrivers -I../drivers -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Ilib/ethdev -I../lib/ethdev -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/argparse -I../lib/argparse -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -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-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -UPEDANTIC -Wno-vla -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx5 -MD -MQ drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -MF drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o.d -o drivers/libtmp_rte_net_mlx5.a.p/net_mlx5_mlx5_rxq.c.o -c ../drivers/net/mlx5/mlx5_rxq.c
In file included from ../drivers/net/mlx5/mlx5_rxq.c:29:
In file included from ../drivers/net/mlx5/mlx5.h:36:
../drivers/net/mlx5/rte_pmd_mlx5.h:10:1: error: version control conflict marker in file
10 | <<<<<<< HEAD
| ^
1 error generated.
[1028/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_intr.c.o
[1029/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_ev.c.o
[1030/3803] Compiling C object drivers/librte_common_qat_base_lib.a.p/common_sfc_efx_base_rhead_nic.c.o
ninja: build stopped
DPDK STV team
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-10-16 8:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-16 8:15 |FAILURE| dpdk-next-net-mlx| 2374f33e1d| Intel-compilation sys_stv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).