|FAILURE| pw159031-159031 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/159031

Test Status Summary:

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


Test environment (aarch64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.14.0-1017-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 (ed957165eadbe60a47d5ec223578cdd1c13d0bd9)
Done: main commit ed957165eadbe60a47d5ec223578cdd1c13d0bd9
Trying to checkout branch: origin/main
Checked out to main (ed957165eadbe60a47d5ec223578cdd1c13d0bd9)
Applying patch...

Failed to apply patch:
Applying: event/cnxk: fix offload flags
Using index info to reconstruct a base tree...
M	drivers/event/cnxk/cn10k_eventdev.c
M	drivers/event/cnxk/cn10k_worker.h
M	drivers/event/cnxk/cn20k_eventdev.c
M	drivers/event/cnxk/cn20k_worker.h
M	drivers/net/cnxk/cn10k_rx.h
M	drivers/net/cnxk/cn20k_rx.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cn20k_rx.h
CONFLICT (content): Merge conflict in drivers/net/cnxk/cn20k_rx.h
Auto-merging drivers/net/cnxk/cn10k_rx.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 event/cnxk: fix offload flags
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/net/cnxk/cn20k_rx.h']
FAILURE