|FAILURE| pw161018-161033 Description: Apply error encountered
al-sw-devops at alabs.net
al-sw-devops at alabs.net
Tue Feb 10 20:34:29 CET 2026
Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered_
https://dpdk.org/patch/161033
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)
Trying to checkout branch: origin/main
Checked out to main (0464ec16a1a118b3092159a2fe5964e46b4c4ae7)
Done: main commit 0464ec16a1a118b3092159a2fe5964e46b4c4ae7
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (7d9857ba5c77a580cfb98550f7e632ac88c428b4)
Applying patch...
Failed to apply patch:
Applying: maintainers: update for pcap driver
Applying: doc: update features for PCAP PMD
Applying: net/pcap: include used headers
Applying: net/pcap: remove unnecessary casts
Applying: net/pcap: avoid using rte_malloc and rte_memcpy
Applying: net/pcap: cleanup transmit burst logic
Applying: net/pcap: consolidate boolean flag handling
Applying: net/pcap: support VLAN insert and strip
Using index info to reconstruct a base tree...
A doc/guides/nics/pcap_ring.rst
M doc/guides/rel_notes/release_26_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
CONFLICT (modify/delete): doc/guides/nics/pcap_ring.rst deleted in HEAD and modified in net/pcap: support VLAN insert and strip. Version net/pcap: support VLAN insert and strip of doc/guides/nics/pcap_ring.rst left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 net/pcap: support VLAN insert and strip
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/nics/pcap_ring.rst', 'doc/guides/rel_notes/release_26_03.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/pcap: add link state and speed for interface mode
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
M drivers/net/pcap/pcap_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/pcap/pcap_ethdev.c
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
Patch failed at 0009 net/pcap: add link state and speed for interface mode
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 (0464ec16a1a118b3092159a2fe5964e46b4c4ae7)
Applying patch...
Failed to apply patch:
Applying: maintainers: update for pcap driver
Applying: doc: update features for PCAP PMD
Applying: net/pcap: include used headers
Applying: net/pcap: remove unnecessary casts
Applying: net/pcap: avoid using rte_malloc and rte_memcpy
Applying: net/pcap: cleanup transmit burst logic
Applying: net/pcap: consolidate boolean flag handling
Applying: net/pcap: support VLAN insert and strip
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 net/pcap: support VLAN insert and strip
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_03.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/pcap: add link state and speed for interface mode
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
M drivers/net/pcap/pcap_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/pcap/pcap_ethdev.c
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
Patch failed at 0009 net/pcap: add link state and speed for interface mode
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.1 LTS
Kernel : 6.14.0-1018-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 (0464ec16a1a118b3092159a2fe5964e46b4c4ae7)
Done: main commit 0464ec16a1a118b3092159a2fe5964e46b4c4ae7
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (7d9857ba5c77a580cfb98550f7e632ac88c428b4)
Applying patch...
Applying: maintainers: update for pcap driver
Applying: doc: update features for PCAP PMD
Applying: net/pcap: include used headers
Applying: net/pcap: remove unnecessary casts
Applying: net/pcap: avoid using rte_malloc and rte_memcpy
Applying: net/pcap: cleanup transmit burst logic
Applying: net/pcap: consolidate boolean flag handling
Applying: net/pcap: support VLAN insert and strip
Using index info to reconstruct a base tree...
A doc/guides/nics/pcap_ring.rst
M doc/guides/rel_notes/release_26_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
CONFLICT (modify/delete): doc/guides/nics/pcap_ring.rst deleted in HEAD and modified in net/pcap: support VLAN insert and strip. Version net/pcap: support VLAN insert and strip of doc/guides/nics/pcap_ring.rst left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 net/pcap: support VLAN insert and strip
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/nics/pcap_ring.rst', 'doc/guides/rel_notes/release_26_03.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/pcap: add link state and speed for interface mode
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
M drivers/net/pcap/pcap_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/pcap/pcap_ethdev.c
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
Patch failed at 0009 net/pcap: add link state and speed for interface mode
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 (0464ec16a1a118b3092159a2fe5964e46b4c4ae7)
Applying patch...
Applying: maintainers: update for pcap driver
Applying: doc: update features for PCAP PMD
Applying: net/pcap: include used headers
Applying: net/pcap: remove unnecessary casts
Applying: net/pcap: avoid using rte_malloc and rte_memcpy
Applying: net/pcap: cleanup transmit burst logic
Applying: net/pcap: consolidate boolean flag handling
Applying: net/pcap: support VLAN insert and strip
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 net/pcap: support VLAN insert and strip
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_03.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: net/pcap: add link state and speed for interface mode
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_26_03.rst
M drivers/net/pcap/pcap_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/pcap/pcap_ethdev.c
Auto-merging doc/guides/rel_notes/release_26_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_03.rst
Patch failed at 0009 net/pcap: add link state and speed for interface mode
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
More information about the test-report
mailing list