|WARNING| pw156159-156162 [PATCH] [4/4] net/gve: support for out of order completions on DQ Rx

[dpdklab@iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/156162

_apply patch failure_

Submitter: Joshua Washington <joshwash@google.com>
Date: Tuesday, August 26 2025 00:03:37 
Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce
Apply patch set 156159-156162 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (96eebfe1330def4b2565fa09a299c2861d7d0d61)
Applying patch...

Failed to apply patch:
Applying: net/gve: free Rx mbufs if allocation fails on ring setup
Using index info to reconstruct a base tree...
M	drivers/net/gve/gve_rx_dqo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/gve/gve_rx_dqo.c
No changes -- Patch already applied.
Applying: net/gve: add datapath-specific logging for gve
Using index info to reconstruct a base tree...
M	drivers/net/gve/gve_logs.h
M	drivers/net/gve/gve_rx_dqo.c
M	drivers/net/gve/gve_tx_dqo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/gve/gve_tx_dqo.c
CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c
Auto-merging drivers/net/gve/gve_rx_dqo.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 net/gve: add datapath-specific logging for gve
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".


Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...

Failed to apply patch:
Applying: net/gve: free Rx mbufs if allocation fails on ring setup
Using index info to reconstruct a base tree...
M	drivers/net/gve/gve_rx_dqo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/gve/gve_rx_dqo.c
No changes -- Patch already applied.
Applying: net/gve: add datapath-specific logging for gve
Using index info to reconstruct a base tree...
M	drivers/net/gve/gve_logs.h
M	drivers/net/gve/gve_rx_dqo.c
M	drivers/net/gve/gve_tx_dqo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/gve/gve_tx_dqo.c
CONFLICT (content): Merge conflict in drivers/net/gve/gve_tx_dqo.c
Auto-merging drivers/net/gve/gve_rx_dqo.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 net/gve: add datapath-specific logging for gve
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".


https://lab.dpdk.org/results/dashboard/patchsets/33952/

UNH-IOL DPDK Community Lab