Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/156162 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 (38543d33bd47fc0ee21f59db80a8763620741879) Done: main commit 38543d33bd47fc0ee21f59db80a8763620741879 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (c71aa7328813a96933fde3b0310726461d1ad1db) Applying patch... Failed to apply patch: Applying: net/gve: free Rx mbufs if allocation fails on ring setup Using index info to reconstruct a base tree... M drivers/net/gve/gve_rx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_rx_dqo.c No changes -- Patch already applied. Applying: net/gve: add datapath-specific logging for gve Using index info to reconstruct a base tree... M drivers/net/gve/gve_logs.h M drivers/net/gve/gve_rx_dqo.c M drivers/net/gve/gve_tx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_tx_dqo.c CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c Auto-merging drivers/net/gve/gve_rx_dqo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 net/gve: add datapath-specific logging for gve 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". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['drivers/net/gve/gve_tx_dqo.c'] Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Failed to apply patch: Applying: net/gve: free Rx mbufs if allocation fails on ring setup Applying: net/gve: add datapath-specific logging for gve Using index info to reconstruct a base tree... M drivers/net/gve/gve_rx_dqo.c M drivers/net/gve/gve_tx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_tx_dqo.c CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c Auto-merging drivers/net/gve/gve_rx_dqo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 net/gve: add datapath-specific logging for gve 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". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['drivers/net/gve/gve_tx_dqo.c'] FAILURE Test environment (x86_64): 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 (x86_64) Cleaning repository state... Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Done: main commit 38543d33bd47fc0ee21f59db80a8763620741879 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (c71aa7328813a96933fde3b0310726461d1ad1db) Applying patch... Applying: net/gve: free Rx mbufs if allocation fails on ring setup Using index info to reconstruct a base tree... M drivers/net/gve/gve_rx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_rx_dqo.c No changes -- Patch already applied. Applying: net/gve: add datapath-specific logging for gve Using index info to reconstruct a base tree... M drivers/net/gve/gve_logs.h M drivers/net/gve/gve_rx_dqo.c M drivers/net/gve/gve_tx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_tx_dqo.c CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c Auto-merging drivers/net/gve/gve_rx_dqo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 net/gve: add datapath-specific logging for gve 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". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['drivers/net/gve/gve_tx_dqo.c'] Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Applying: net/gve: free Rx mbufs if allocation fails on ring setup Applying: net/gve: add datapath-specific logging for gve Using index info to reconstruct a base tree... M drivers/net/gve/gve_rx_dqo.c M drivers/net/gve/gve_tx_dqo.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/gve/gve_tx_dqo.c CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c Auto-merging drivers/net/gve/gve_rx_dqo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 net/gve: add datapath-specific logging for gve 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". Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['drivers/net/gve/gve_tx_dqo.c'] FAILURE