|FAILURE| pw165156-165156 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/165156

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 (4aa37a939343c43888db10191633d2c3b5b7d881)
Done: main commit 4aa37a939343c43888db10191633d2c3b5b7d881
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (a75e82216446deca5385a2056e16feb931ab9808)
Applying patch...

Failed to apply patch:
Applying: net/iavf: remove unreachable hash action case
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_hash.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_hash.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_hash.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 net/iavf: remove unreachable hash action case
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/iavf/iavf_hash.c']
Non-.rst conflicts: ['drivers/net/intel/iavf/iavf_hash.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/iavf/iavf_hash.c']
Trying to checkout branch: origin/main
Checked out to main (4aa37a939343c43888db10191633d2c3b5b7d881)
Applying patch...

Failed to apply patch:
Applying: net/iavf: remove unreachable hash action case
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_hash.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_hash.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_hash.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 net/iavf: remove unreachable hash action case
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/iavf/iavf_hash.c']
Non-.rst conflicts: ['drivers/net/intel/iavf/iavf_hash.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/iavf/iavf_hash.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 (4aa37a939343c43888db10191633d2c3b5b7d881)
Done: main commit 4aa37a939343c43888db10191633d2c3b5b7d881
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (a75e82216446deca5385a2056e16feb931ab9808)
Applying patch...
Applying: net/iavf: remove unreachable hash action case
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_hash.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_hash.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_hash.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 net/iavf: remove unreachable hash action case
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/iavf/iavf_hash.c']
Non-.rst conflicts: ['drivers/net/intel/iavf/iavf_hash.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/iavf/iavf_hash.c']
Trying to checkout branch: origin/main
Checked out to main (4aa37a939343c43888db10191633d2c3b5b7d881)
Applying patch...
Applying: net/iavf: remove unreachable hash action case
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_hash.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_hash.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_hash.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 net/iavf: remove unreachable hash action case
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/iavf/iavf_hash.c']
Non-.rst conflicts: ['drivers/net/intel/iavf/iavf_hash.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/iavf/iavf_hash.c']
FAILURE