|FAILURE| pw154773-154773 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_
http://dpdk.org/patch/154773

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

Failed to apply patch:
Applying: net/ice: update null check for TxPP support
Using index info to reconstruct a base tree...
M	drivers/net/intel/ice/ice_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ice/ice_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/intel/ice/ice_rxtx.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/ice: update null check for TxPP support
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".


Trying to checkout branch: origin/main
Checked out to main (2c6f1f0a847898732c18c8b37821850f1b48aa9d)
Applying patch...

Failed to apply patch:
Applying: net/ice: update null check for TxPP support
Using index info to reconstruct a base tree...
M	drivers/net/intel/ice/ice_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ice/ice_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/intel/ice/ice_rxtx.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/ice: update null check for TxPP support
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".


FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.8.0-1029-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 (2c6f1f0a847898732c18c8b37821850f1b48aa9d)
Done: main commit 2c6f1f0a847898732c18c8b37821850f1b48aa9d
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (63a975a32763288ef7063adae6eb9e6b59506c70)
Applying patch...
Applying: net/ice: update null check for TxPP support
error: sha1 information is lacking or useless (drivers/net/intel/ice/ice_rxtx.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/ice: update null check for TxPP support
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".



Trying to checkout branch: origin/main
Checked out to main (2c6f1f0a847898732c18c8b37821850f1b48aa9d)
Applying patch...
Applying: net/ice: update null check for TxPP support
error: sha1 information is lacking or useless (drivers/net/intel/ice/ice_rxtx.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/ice: update null check for TxPP support
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".



FAILURE