|FAILURE| pw159967-159974 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/159974

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

Failed to apply patch:
Applying: net/nfb: prepare for indirect queue mapping scheme
Using index info to reconstruct a base tree...
M	drivers/net/nfb/nfb.h
M	drivers/net/nfb/nfb_ethdev.c
M	drivers/net/nfb/nfb_rx.c
M	drivers/net/nfb/nfb_tx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nfb/nfb_tx.c
Auto-merging drivers/net/nfb/nfb_rx.c
Auto-merging drivers/net/nfb/nfb_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/nfb/nfb_ethdev.c
Auto-merging drivers/net/nfb/nfb.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 net/nfb: prepare for indirect queue mapping scheme
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/nfb/nfb_ethdev.c']
Trying to checkout branch: origin/main
Checked out to main (636b16520de5c12c22ae2171c764877969373bf6)
Applying patch...

Failed to apply patch:
Applying: net/nfb: prepare for indirect queue mapping scheme
Using index info to reconstruct a base tree...
M	drivers/net/nfb/nfb.h
M	drivers/net/nfb/nfb_ethdev.c
M	drivers/net/nfb/nfb_rx.c
M	drivers/net/nfb/nfb_tx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nfb/nfb_tx.c
Auto-merging drivers/net/nfb/nfb_rx.c
Auto-merging drivers/net/nfb/nfb_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/nfb/nfb_ethdev.c
Auto-merging drivers/net/nfb/nfb.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 net/nfb: prepare for indirect queue mapping scheme
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/nfb/nfb_ethdev.c']
FAILURE


Test environment (x86_64):
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 (x86_64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (636b16520de5c12c22ae2171c764877969373bf6)
Done: main commit 636b16520de5c12c22ae2171c764877969373bf6
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (d83c2bd237cc1a95ceb15af0a16664d21f00b4fd)
Applying patch...
Applying: net/nfb: prepare for indirect queue mapping scheme
Using index info to reconstruct a base tree...
M	drivers/net/nfb/nfb.h
M	drivers/net/nfb/nfb_ethdev.c
M	drivers/net/nfb/nfb_rx.c
M	drivers/net/nfb/nfb_tx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nfb/nfb_tx.c
Auto-merging drivers/net/nfb/nfb_rx.c
Auto-merging drivers/net/nfb/nfb_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/nfb/nfb_ethdev.c
Auto-merging drivers/net/nfb/nfb.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 net/nfb: prepare for indirect queue mapping scheme
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/nfb/nfb_ethdev.c']
Trying to checkout branch: origin/main
Checked out to main (636b16520de5c12c22ae2171c764877969373bf6)
Applying patch...
Applying: net/nfb: prepare for indirect queue mapping scheme
Using index info to reconstruct a base tree...
M	drivers/net/nfb/nfb.h
M	drivers/net/nfb/nfb_ethdev.c
M	drivers/net/nfb/nfb_rx.c
M	drivers/net/nfb/nfb_tx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nfb/nfb_tx.c
Auto-merging drivers/net/nfb/nfb_rx.c
Auto-merging drivers/net/nfb/nfb_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/nfb/nfb_ethdev.c
Auto-merging drivers/net/nfb/nfb.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 net/nfb: prepare for indirect queue mapping scheme
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/nfb/nfb_ethdev.c']
FAILURE