Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/155017 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 (70c2297528e7c7789af452f78de1932e9a20c8a2) Done: main commit 70c2297528e7c7789af452f78de1932e9a20c8a2 Trying to checkout branch: origin/main Checked out to main (70c2297528e7c7789af452f78de1932e9a20c8a2) Applying patch... Failed to apply patch: Applying: ntb/ae4dma: added Amd userspace DMA and NTB drivers .git/rebase-apply/patch:3148: trailing whitespace. .git/rebase-apply/patch:3000: new blank line at EOF. + warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M app/test/test_dmadev.c M drivers/raw/ntb/ntb_hw_intel.c M usertools/dpdk-devbind.py Falling back to patching base and 3-way merge... Auto-merging usertools/dpdk-devbind.py CONFLICT (content): Merge conflict in usertools/dpdk-devbind.py Auto-merging drivers/raw/ntb/ntb_hw_intel.c Auto-merging app/test/test_dmadev.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 ntb/ae4dma: added Amd userspace DMA and NTB drivers 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: ['usertools/dpdk-devbind.py'] 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 (70c2297528e7c7789af452f78de1932e9a20c8a2) Done: main commit 70c2297528e7c7789af452f78de1932e9a20c8a2 Trying to checkout branch: origin/main Checked out to main (70c2297528e7c7789af452f78de1932e9a20c8a2) Applying patch... Applying: ntb/ae4dma: added Amd userspace DMA and NTB drivers .git/rebase-apply/patch:3148: trailing whitespace. .git/rebase-apply/patch:3000: new blank line at EOF. + warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M app/test/test_dmadev.c M drivers/raw/ntb/ntb_hw_intel.c M usertools/dpdk-devbind.py Falling back to patching base and 3-way merge... Auto-merging usertools/dpdk-devbind.py CONFLICT (content): Merge conflict in usertools/dpdk-devbind.py Auto-merging drivers/raw/ntb/ntb_hw_intel.c Auto-merging app/test/test_dmadev.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 ntb/ae4dma: added Amd userspace DMA and NTB drivers 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: ['usertools/dpdk-devbind.py'] FAILURE