Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/156420 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.14.0-1012-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 (211f1660212809640003eb83664d4fbaa01e1a2a) Done: main commit 211f1660212809640003eb83664d4fbaa01e1a2a Trying to checkout branch: origin/main Checked out to main (211f1660212809640003eb83664d4fbaa01e1a2a) Applying patch... Failed to apply patch: Applying: pci: pci_vfio: Retry vfio setup device reset, if device is busy Using index info to reconstruct a base tree... M drivers/bus/pci/linux/pci_vfio.c Falling back to patching base and 3-way merge... Auto-merging drivers/bus/pci/linux/pci_vfio.c CONFLICT (content): Merge conflict in drivers/bus/pci/linux/pci_vfio.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 pci: pci_vfio: Retry vfio setup device reset, if device is busy 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/bus/pci/linux/pci_vfio.c'] FAILURE Test environment (x86_64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.14.0-1012-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 (211f1660212809640003eb83664d4fbaa01e1a2a) Done: main commit 211f1660212809640003eb83664d4fbaa01e1a2a Trying to checkout branch: origin/main Checked out to main (211f1660212809640003eb83664d4fbaa01e1a2a) Applying patch... Patch failed. Checking for conflicts in .rst files... Patch apply failed with conflicts in non-.rst files: ['drivers/bus/pci/linux/pci_vfio.c'] FAILURE