|FAILURE| pw164459-164483 Description: Apply error encountered

[al-sw-devops at alabs.net]

Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered _
https://dpdk.org/patch/164483

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.17.0-1007-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 (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Done: main commit 9cf7c64abe4b8320fb498647a2216b5a9dc729c3
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Applying patch...

Failed to apply patch:
Applying: bus/ifpga: remove unused AFU lookup helper
Applying: bus/uacce: set API version during scan
Applying: crypto/octeontx: remove check on driver in remove
Applying: dma/idxd: clear device at scan
Applying: bus: remove device and driver checks in DMA map/unmap
Applying: drivers/bus: remove device and driver checks in unplug
Applying: drivers/bus: remove device and driver checks in plug
Applying: bus: add bus conversion macros
Applying: bus: factorize driver list
Applying: bus: factorize device list
Applying: bus: consolidate device lookup
Applying: bus: consolidate device iteration
Applying: bus: factorize driver lookup
Applying: bus: refactor device probe
Applying: bus: support multiple probe
Applying: drivers/bus: initialize NXP bus specifics in scan
Applying: bus: implement probe in EAL
Applying: bus: factorize driver reference
Applying: drivers: rely on generic driver
Applying: drivers/bus: remove bus-specific driver references
Applying: dma/idxd: remove specific bus type
Applying: drivers/bus: separate specific bus metadata for NXP drivers
Applying: drivers/bus: remove specific bus types
Applying: eventdev: rename dev field to device
Applying: bus: add class device conversion macro
Using index info to reconstruct a base tree...
M	drivers/net/intel/cpfl/cpfl_ethdev.c
M	drivers/net/intel/cpfl/cpfl_ethdev.h
M	drivers/net/intel/e1000/em_rxtx.c
M	drivers/net/intel/e1000/igb_pf.c
M	drivers/net/intel/i40e/i40e_ethdev.c
M	drivers/net/intel/iavf/iavf_ethdev.c
M	drivers/net/intel/ice/ice_dcf.c
M	drivers/net/intel/ice/ice_ethdev.c
M	drivers/net/intel/ice/ice_ethdev.h
M	drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
M	drivers/net/intel/ipn3ke/ipn3ke_representor.c
M	drivers/net/intel/ixgbe/ixgbe_ethdev.c
M	drivers/net/intel/ixgbe/ixgbe_flow.c
M	drivers/net/intel/ixgbe/ixgbe_pf.c
M	drivers/net/intel/ixgbe/ixgbe_tm.c
M	drivers/net/intel/ixgbe/ixgbe_vf_representor.c
M	drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_vf_representor.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_vf_representor.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_tm.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_pf.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_flow.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_flow.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_ethdev.c
Auto-merging drivers/net/intel/ipn3ke/ipn3ke_representor.c
Auto-merging drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
Auto-merging drivers/net/intel/ice/ice_ethdev.h
Auto-merging drivers/net/intel/ice/ice_ethdev.c
Auto-merging drivers/net/intel/ice/ice_dcf.c
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
Auto-merging drivers/net/intel/i40e/i40e_ethdev.c
Auto-merging drivers/net/intel/e1000/igb_pf.c
Auto-merging drivers/net/intel/e1000/em_rxtx.c
Auto-merging drivers/net/intel/cpfl/cpfl_ethdev.h
Auto-merging drivers/net/intel/cpfl/cpfl_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0025 bus: add class device conversion macro
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...
Conflicted files: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
Non-.rst conflicts: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.3 LTS
Kernel : 6.17.0-1007-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 (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Done: main commit 9cf7c64abe4b8320fb498647a2216b5a9dc729c3
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Applying patch...
Applying: bus/ifpga: remove unused AFU lookup helper
Applying: bus/uacce: set API version during scan
Applying: crypto/octeontx: remove check on driver in remove
Applying: dma/idxd: clear device at scan
Applying: bus: remove device and driver checks in DMA map/unmap
Applying: drivers/bus: remove device and driver checks in unplug
Applying: drivers/bus: remove device and driver checks in plug
Applying: bus: add bus conversion macros
Applying: bus: factorize driver list
Applying: bus: factorize device list
Applying: bus: consolidate device lookup
Applying: bus: consolidate device iteration
Applying: bus: factorize driver lookup
Applying: bus: refactor device probe
Applying: bus: support multiple probe
Applying: drivers/bus: initialize NXP bus specifics in scan
Applying: bus: implement probe in EAL
Applying: bus: factorize driver reference
Applying: drivers: rely on generic driver
Applying: drivers/bus: remove bus-specific driver references
Applying: dma/idxd: remove specific bus type
Applying: drivers/bus: separate specific bus metadata for NXP drivers
Applying: drivers/bus: remove specific bus types
Applying: eventdev: rename dev field to device
Applying: bus: add class device conversion macro
Using index info to reconstruct a base tree...
M	drivers/net/intel/cpfl/cpfl_ethdev.c
M	drivers/net/intel/cpfl/cpfl_ethdev.h
M	drivers/net/intel/e1000/em_rxtx.c
M	drivers/net/intel/e1000/igb_pf.c
M	drivers/net/intel/i40e/i40e_ethdev.c
M	drivers/net/intel/iavf/iavf_ethdev.c
M	drivers/net/intel/ice/ice_dcf.c
M	drivers/net/intel/ice/ice_ethdev.c
M	drivers/net/intel/ice/ice_ethdev.h
M	drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
M	drivers/net/intel/ipn3ke/ipn3ke_representor.c
M	drivers/net/intel/ixgbe/ixgbe_ethdev.c
M	drivers/net/intel/ixgbe/ixgbe_flow.c
M	drivers/net/intel/ixgbe/ixgbe_pf.c
M	drivers/net/intel/ixgbe/ixgbe_tm.c
M	drivers/net/intel/ixgbe/ixgbe_vf_representor.c
M	drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_vf_representor.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_vf_representor.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_tm.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_pf.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_flow.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_flow.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_ethdev.c
Auto-merging drivers/net/intel/ipn3ke/ipn3ke_representor.c
Auto-merging drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
Auto-merging drivers/net/intel/ice/ice_ethdev.h
Auto-merging drivers/net/intel/ice/ice_ethdev.c
Auto-merging drivers/net/intel/ice/ice_dcf.c
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
Auto-merging drivers/net/intel/i40e/i40e_ethdev.c
Auto-merging drivers/net/intel/e1000/igb_pf.c
Auto-merging drivers/net/intel/e1000/em_rxtx.c
Auto-merging drivers/net/intel/cpfl/cpfl_ethdev.h
Auto-merging drivers/net/intel/cpfl/cpfl_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0025 bus: add class device conversion macro
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...
Conflicted files: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
Non-.rst conflicts: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/ixgbe/ixgbe_ethdev.c', 'drivers/net/intel/ixgbe/ixgbe_flow.c', 'drivers/net/intel/ixgbe/ixgbe_vf_representor.c']
FAILURE