|FAILURE| pw160583-160618 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/160618

Test Status Summary:

+--------------+------------------+
| Architecture | DPDK Unit Test   |
+--------------+------------------+
| x86_64       | FAILURE           |
+--------------+------------------+
| arm64        | Not Tested           |
+--------------+------------------+


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.14.0-1018-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 (fe093c4e31eaf62c57c9b69d258cd3d1b7c3b48e)
Done: main commit fe093c4e31eaf62c57c9b69d258cd3d1b7c3b48e
Trying to checkout branch: origin/main
Checked out to main (fe093c4e31eaf62c57c9b69d258cd3d1b7c3b48e)
Applying patch...
Applying: net/intel: create common Tx descriptor structure
Using index info to reconstruct a base tree...
M	drivers/net/intel/common/tx.h
M	drivers/net/intel/cpfl/cpfl_rxtx.c
M	drivers/net/intel/i40e/i40e_rxtx.c
M	drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c
M	drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
M	drivers/net/intel/i40e/i40e_rxtx_vec_neon.c
M	drivers/net/intel/iavf/iavf_rxtx.c
M	drivers/net/intel/iavf/iavf_rxtx.h
M	drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
M	drivers/net/intel/ice/ice_rxtx.c
M	drivers/net/intel/ice/ice_rxtx_vec_avx2.c
M	drivers/net/intel/idpf/idpf_common_rxtx.c
M	drivers/net/intel/idpf/idpf_common_rxtx.h
M	drivers/net/intel/idpf/idpf_rxtx.c
M	drivers/net/intel/idpf/idpf_rxtx_vec_common.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/idpf/idpf_rxtx_vec_common.h
Auto-merging drivers/net/intel/idpf/idpf_rxtx.c
Auto-merging drivers/net/intel/idpf/idpf_common_rxtx.h
Auto-merging drivers/net/intel/idpf/idpf_common_rxtx.c
Auto-merging drivers/net/intel/ice/ice_rxtx_vec_avx2.c
Auto-merging drivers/net/intel/ice/ice_rxtx.c
Auto-merging drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
Auto-merging drivers/net/intel/iavf/iavf_rxtx.h
Auto-merging drivers/net/intel/iavf/iavf_rxtx.c
Auto-merging drivers/net/intel/i40e/i40e_rxtx_vec_neon.c
Auto-merging drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
Auto-merging drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c
Auto-merging drivers/net/intel/i40e/i40e_rxtx.c
Auto-merging drivers/net/intel/cpfl/cpfl_rxtx.c
Auto-merging drivers/net/intel/common/tx.h
Applying: net/intel: use common Tx ring structure
Applying: net/intel: create common post-Tx cleanup function
Applying: net/intel: consolidate definitions for Tx desc fields
error: sha1 information is lacking or useless (drivers/net/intel/common/tx.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 net/intel: consolidate definitions for Tx desc fields
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: []
FAILURE