|FAILURE| pw167082-167083 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/167083

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

Failed to apply patch:
Applying: net/af_xdp: add af_xdp rx metadata and dynamic timestamping support
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
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
Auto-merging doc/guides/nics/af_xdp.rst
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/af_xdp: add af_xdp rx metadata and dynamic timestamping 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".


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/af_xdp: add read_clock support to AF_XDP PMD
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging doc/guides/nics/af_xdp.rst
CONFLICT (content): Merge conflict in doc/guides/nics/af_xdp.rst
Patch failed at 0002 net/af_xdp: add read_clock support to AF_XDP PMD
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
Trying to checkout branch: origin/main
Checked out to main (c1a46b9d9243e922428e8a5f87fa3c6ac177dc5a)
Applying patch...

Failed to apply patch:
Applying: net/af_xdp: add af_xdp rx metadata and dynamic timestamping support
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
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
Auto-merging doc/guides/nics/af_xdp.rst
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/af_xdp: add af_xdp rx metadata and dynamic timestamping 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".


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/af_xdp: add read_clock support to AF_XDP PMD
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging doc/guides/nics/af_xdp.rst
CONFLICT (content): Merge conflict in doc/guides/nics/af_xdp.rst
Patch failed at 0002 net/af_xdp: add read_clock support to AF_XDP PMD
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-1019-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 (c1a46b9d9243e922428e8a5f87fa3c6ac177dc5a)
Done: main commit c1a46b9d9243e922428e8a5f87fa3c6ac177dc5a
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (203ad204c8e3108449ffef9871bc1d90fb935195)
Applying patch...
Applying: net/af_xdp: add af_xdp rx metadata and dynamic timestamping support
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
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
Auto-merging doc/guides/nics/af_xdp.rst
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/af_xdp: add af_xdp rx metadata and dynamic timestamping 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".



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/af_xdp: add read_clock support to AF_XDP PMD
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging doc/guides/nics/af_xdp.rst
CONFLICT (content): Merge conflict in doc/guides/nics/af_xdp.rst
Patch failed at 0002 net/af_xdp: add read_clock support to AF_XDP PMD
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
Trying to checkout branch: origin/main
Checked out to main (c1a46b9d9243e922428e8a5f87fa3c6ac177dc5a)
Applying patch...
Applying: net/af_xdp: add af_xdp rx metadata and dynamic timestamping support
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
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
Auto-merging doc/guides/nics/af_xdp.rst
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/af_xdp: add af_xdp rx metadata and dynamic timestamping 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".



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/af_xdp: add read_clock support to AF_XDP PMD
Using index info to reconstruct a base tree...
M	doc/guides/nics/af_xdp.rst
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging doc/guides/nics/af_xdp.rst
CONFLICT (content): Merge conflict in doc/guides/nics/af_xdp.rst
Patch failed at 0002 net/af_xdp: add read_clock support to AF_XDP PMD
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