Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/154585 Test Status Summary: +--------------+------------------+ | Architecture | DPDK Unit Test | +--------------+------------------+ | x86_64 | FAILURE | +--------------+------------------+ | arm64 | FAILURE | +--------------+------------------+ Test environment (aarch64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1030-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (aarch64) Cleaning repository state... Trying to checkout branch: origin/main Checked out to main (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Done: main commit a60378a398fd95e6de69401e8ed06fcc3f4a3929 Trying to checkout branch: origin/next-net-mlx-for-next-net Checked out to next-net-mlx-for-next-net (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Applying patch... Failed to apply patch: Applying: net/mlx5: mlx5 malloc NUMA fallback Using index info to reconstruct a base tree... M drivers/common/mlx5/mlx5_common_devx.c M drivers/common/mlx5/mlx5_devx_cmds.c M drivers/common/mlx5/mlx5_malloc.c M drivers/common/mlx5/mlx5_malloc.h M drivers/net/mlx5/mlx5.c M drivers/net/mlx5/mlx5_devx.c M drivers/net/mlx5/mlx5_flow_hw.c M drivers/net/mlx5/mlx5_rxq.c M drivers/net/mlx5/mlx5_trigger.c M drivers/net/mlx5/mlx5_txq.c M drivers/net/mlx5/mlx5_utils.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_utils.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_utils.c Auto-merging drivers/net/mlx5/mlx5_txq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_txq.c Auto-merging drivers/net/mlx5/mlx5_trigger.c Auto-merging drivers/net/mlx5/mlx5_rxq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_rxq.c Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c Auto-merging drivers/net/mlx5/mlx5_devx.c Auto-merging drivers/net/mlx5/mlx5.c Auto-merging drivers/common/mlx5/mlx5_malloc.h CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.h Auto-merging drivers/common/mlx5/mlx5_malloc.c CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.c Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/mlx5: mlx5 malloc NUMA fallback When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Trying to checkout branch: origin/main Checked out to main (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Applying patch... Failed to apply patch: Applying: net/mlx5: mlx5 malloc NUMA fallback Using index info to reconstruct a base tree... M drivers/common/mlx5/mlx5_common_devx.c M drivers/common/mlx5/mlx5_devx_cmds.c M drivers/common/mlx5/mlx5_malloc.c M drivers/common/mlx5/mlx5_malloc.h M drivers/net/mlx5/mlx5.c M drivers/net/mlx5/mlx5_devx.c M drivers/net/mlx5/mlx5_flow_hw.c M drivers/net/mlx5/mlx5_rxq.c M drivers/net/mlx5/mlx5_trigger.c M drivers/net/mlx5/mlx5_txq.c M drivers/net/mlx5/mlx5_utils.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_utils.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_utils.c Auto-merging drivers/net/mlx5/mlx5_txq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_txq.c Auto-merging drivers/net/mlx5/mlx5_trigger.c Auto-merging drivers/net/mlx5/mlx5_rxq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_rxq.c Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c Auto-merging drivers/net/mlx5/mlx5_devx.c Auto-merging drivers/net/mlx5/mlx5.c Auto-merging drivers/common/mlx5/mlx5_malloc.h CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.h Auto-merging drivers/common/mlx5/mlx5_malloc.c CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.c Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/mlx5: mlx5 malloc NUMA fallback When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". FAILURE Test environment (x86_64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1029-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (x86_64) Cleaning repository state... Trying to checkout branch: origin/main Checked out to main (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Done: main commit a60378a398fd95e6de69401e8ed06fcc3f4a3929 Trying to checkout branch: origin/next-net-mlx-for-next-net Checked out to next-net-mlx-for-next-net (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Applying patch... Applying: net/mlx5: mlx5 malloc NUMA fallback Using index info to reconstruct a base tree... M drivers/common/mlx5/mlx5_common_devx.c M drivers/common/mlx5/mlx5_devx_cmds.c M drivers/common/mlx5/mlx5_malloc.c M drivers/common/mlx5/mlx5_malloc.h M drivers/net/mlx5/mlx5.c M drivers/net/mlx5/mlx5_devx.c M drivers/net/mlx5/mlx5_flow_hw.c M drivers/net/mlx5/mlx5_rxq.c M drivers/net/mlx5/mlx5_trigger.c M drivers/net/mlx5/mlx5_txq.c M drivers/net/mlx5/mlx5_utils.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_utils.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_utils.c Auto-merging drivers/net/mlx5/mlx5_txq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_txq.c Auto-merging drivers/net/mlx5/mlx5_trigger.c Auto-merging drivers/net/mlx5/mlx5_rxq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_rxq.c Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c Auto-merging drivers/net/mlx5/mlx5_devx.c Auto-merging drivers/net/mlx5/mlx5.c Auto-merging drivers/common/mlx5/mlx5_malloc.h CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.h Auto-merging drivers/common/mlx5/mlx5_malloc.c CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.c Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/mlx5: mlx5 malloc NUMA fallback When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Trying to checkout branch: origin/main Checked out to main (a60378a398fd95e6de69401e8ed06fcc3f4a3929) Applying patch... Applying: net/mlx5: mlx5 malloc NUMA fallback Using index info to reconstruct a base tree... M drivers/common/mlx5/mlx5_common_devx.c M drivers/common/mlx5/mlx5_devx_cmds.c M drivers/common/mlx5/mlx5_malloc.c M drivers/common/mlx5/mlx5_malloc.h M drivers/net/mlx5/mlx5.c M drivers/net/mlx5/mlx5_devx.c M drivers/net/mlx5/mlx5_flow_hw.c M drivers/net/mlx5/mlx5_rxq.c M drivers/net/mlx5/mlx5_trigger.c M drivers/net/mlx5/mlx5_txq.c M drivers/net/mlx5/mlx5_utils.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_utils.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_utils.c Auto-merging drivers/net/mlx5/mlx5_txq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_txq.c Auto-merging drivers/net/mlx5/mlx5_trigger.c Auto-merging drivers/net/mlx5/mlx5_rxq.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_rxq.c Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c Auto-merging drivers/net/mlx5/mlx5_devx.c Auto-merging drivers/net/mlx5/mlx5.c Auto-merging drivers/common/mlx5/mlx5_malloc.h CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.h Auto-merging drivers/common/mlx5/mlx5_malloc.c CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_malloc.c Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/mlx5: mlx5 malloc NUMA fallback When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". FAILURE