|FAILURE| pw166376-166393 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/166393

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.17.0-1007-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 (edff93f638540783af448de1d40a365b9aee52a6)
Done: main commit edff93f638540783af448de1d40a365b9aee52a6
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (7447dba7d50dd6f5a9b2096e6505cdf370de08e8)
Applying patch...

Failed to apply patch:
Applying: net/enetc: fix TX BD structure
Using index info to reconstruct a base tree...
M	drivers/net/enetc/base/enetc_hw.h
M	drivers/net/enetc/enetc_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/enetc/enetc_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/enetc/enetc_rxtx.c
Auto-merging drivers/net/enetc/base/enetc_hw.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/enetc: fix TX BD structure
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...
Conflicted files: ['drivers/net/enetc/enetc_rxtx.c']
Non-.rst conflicts: ['drivers/net/enetc/enetc_rxtx.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/enetc/enetc_rxtx.c']
Trying to checkout branch: origin/main
Checked out to main (edff93f638540783af448de1d40a365b9aee52a6)
Applying patch...

Failed to apply patch:
Applying: net/enetc: fix TX BD structure
Applying: net/enetc: fix queue initialization
Applying: net/enetc: support ESP packet type in packet parsing
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 net/enetc: support ESP packet type in packet parsing
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...
Conflicted files: ['doc/guides/rel_notes/release_26_07.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/enetc: update random MAC generation code
Applying: net/enetc: support scatter-gather
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/enetc/base/enetc_hw.h
M	drivers/net/enetc/enetc_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/enetc/enetc_rxtx.c
Auto-merging drivers/net/enetc/base/enetc_hw.h
CONFLICT (content): Merge conflict in drivers/net/enetc/base/enetc_hw.h
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Patch failed at 0005 net/enetc: support scatter-gather
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".

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Failed to skip patch
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.3 LTS
Kernel : 6.17.0-1007-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 (edff93f638540783af448de1d40a365b9aee52a6)
Done: main commit edff93f638540783af448de1d40a365b9aee52a6
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (7447dba7d50dd6f5a9b2096e6505cdf370de08e8)
Applying patch...
Applying: net/enetc: fix TX BD structure
Using index info to reconstruct a base tree...
M	drivers/net/enetc/base/enetc_hw.h
M	drivers/net/enetc/enetc_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/enetc/enetc_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/enetc/enetc_rxtx.c
Auto-merging drivers/net/enetc/base/enetc_hw.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/enetc: fix TX BD structure
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...
Conflicted files: ['drivers/net/enetc/enetc_rxtx.c']
Non-.rst conflicts: ['drivers/net/enetc/enetc_rxtx.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/net/enetc/enetc_rxtx.c']
Trying to checkout branch: origin/main
Checked out to main (edff93f638540783af448de1d40a365b9aee52a6)
Applying patch...
Applying: net/enetc: fix TX BD structure
Applying: net/enetc: fix queue initialization
Applying: net/enetc: support ESP packet type in packet parsing
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 net/enetc: support ESP packet type in packet parsing
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...
Conflicted files: ['doc/guides/rel_notes/release_26_07.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/enetc: update random MAC generation code
Applying: net/enetc: support scatter-gather
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/enetc/base/enetc_hw.h
M	drivers/net/enetc/enetc_rxtx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/enetc/enetc_rxtx.c
Auto-merging drivers/net/enetc/base/enetc_hw.h
CONFLICT (content): Merge conflict in drivers/net/enetc/base/enetc_hw.h
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Patch failed at 0005 net/enetc: support scatter-gather
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".

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Failed to skip patch
FAILURE