Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/156005 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/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Failed to apply patch: Applying: app/test: remove use of non-standard array range initialization Applying: drivers/net: remove use of non-standard array range initialization Using index info to reconstruct a base tree... M drivers/net/octeon_ep/otx_ep_mbox.c M drivers/net/r8169/base/rtl8125a_mcu.c M drivers/net/r8169/base/rtl8126a.c M drivers/net/r8169/r8169_ethdev.c M drivers/net/r8169/r8169_hw.c M drivers/net/r8169/r8169_phy.c M drivers/net/r8169/r8169_rxtx.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/r8169/r8169_rxtx.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_rxtx.c Auto-merging drivers/net/r8169/r8169_phy.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_phy.c Auto-merging drivers/net/r8169/r8169_hw.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_hw.c Auto-merging drivers/net/r8169/r8169_ethdev.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_ethdev.c Auto-merging drivers/net/r8169/base/rtl8126a.c CONFLICT (content): Merge conflict in drivers/net/r8169/base/rtl8126a.c Auto-merging drivers/net/r8169/base/rtl8125a_mcu.c CONFLICT (content): Merge conflict in drivers/net/r8169/base/rtl8125a_mcu.c Auto-merging drivers/net/octeon_ep/otx_ep_mbox.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 drivers/net: remove use of non-standard array range initialization 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/r8169/base/rtl8125a_mcu.c', 'drivers/net/r8169/base/rtl8126a.c', 'drivers/net/r8169/r8169_ethdev.c', 'drivers/net/r8169/r8169_hw.c', 'drivers/net/r8169/r8169_phy.c', 'drivers/net/r8169/r8169_rxtx.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/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Applying: app/test: remove use of non-standard array range initialization Applying: drivers/net: remove use of non-standard array range initialization Using index info to reconstruct a base tree... M drivers/net/octeon_ep/otx_ep_mbox.c M drivers/net/r8169/base/rtl8125a_mcu.c M drivers/net/r8169/base/rtl8126a.c M drivers/net/r8169/r8169_ethdev.c M drivers/net/r8169/r8169_hw.c M drivers/net/r8169/r8169_phy.c M drivers/net/r8169/r8169_rxtx.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/r8169/r8169_rxtx.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_rxtx.c Auto-merging drivers/net/r8169/r8169_phy.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_phy.c Auto-merging drivers/net/r8169/r8169_hw.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_hw.c Auto-merging drivers/net/r8169/r8169_ethdev.c CONFLICT (content): Merge conflict in drivers/net/r8169/r8169_ethdev.c Auto-merging drivers/net/r8169/base/rtl8126a.c CONFLICT (content): Merge conflict in drivers/net/r8169/base/rtl8126a.c Auto-merging drivers/net/r8169/base/rtl8125a_mcu.c CONFLICT (content): Merge conflict in drivers/net/r8169/base/rtl8125a_mcu.c Auto-merging drivers/net/octeon_ep/otx_ep_mbox.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 drivers/net: remove use of non-standard array range initialization 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/r8169/base/rtl8125a_mcu.c', 'drivers/net/r8169/base/rtl8126a.c', 'drivers/net/r8169/r8169_ethdev.c', 'drivers/net/r8169/r8169_hw.c', 'drivers/net/r8169/r8169_phy.c', 'drivers/net/r8169/r8169_rxtx.c'] FAILURE