|FAILURE| pw155603-155633 ethdev: Reject conflicting TX offloads configuration

[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/155633

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

Failed to apply patch:
Applying: ethdev: Reject conflicting TX offloads configuration
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.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 ethdev: Reject conflicting TX offloads configuration
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: ['lib/ethdev/rte_ethdev.c']
Trying to checkout branch: origin/main
Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879)
Applying patch...

Failed to apply patch:
Applying: ethdev: Reject conflicting TX offloads configuration
Applying: ethdev: Reject conflicting TX offloads configuration
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 ethdev: Reject conflicting TX offloads configuration
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: ['lib/ethdev/rte_ethdev.c']
FAILURE


Test environment (x86_64):
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 (x86_64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879)
Done: main commit 38543d33bd47fc0ee21f59db80a8763620741879
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (507dd6a18ebcae562fd0539bddbf499a4b891bb7)
Applying patch...
Applying: ethdev: Reject conflicting TX offloads configuration
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.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 ethdev: Reject conflicting TX offloads configuration
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: ['lib/ethdev/rte_ethdev.c']
Trying to checkout branch: origin/main
Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879)
Applying patch...
Applying: ethdev: Reject conflicting TX offloads configuration
Applying: ethdev: Reject conflicting TX offloads configuration
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 ethdev: Reject conflicting TX offloads configuration
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: ['lib/ethdev/rte_ethdev.c']
FAILURE