|WARNING| pw153609-153615 [PATCH] [v3, 7/7] net/ena: upgrade driver version to 2.13.0

[dpdklab@iol.unh.edu]

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

_apply patch failure_

Submitter: Shai Brandes <shaibran@amazon.com>
Date: Thursday, May 22 2025 13:30:29 
Applied on: CommitID:117e86c4b96ed761e9a7ab766261208fe81bf5ca
Apply patch set 153609-153615 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 (117e86c4b96ed761e9a7ab766261208fe81bf5ca)
Done: main commit 117e86c4b96ed761e9a7ab766261208fe81bf5ca
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (a0ad790eb9fcef4b00366ae474132bee4bcdab75)
Applying patch...

Failed to apply patch:
Applying: net/ena/base: avoid recalculating desc per entry
Using index info to reconstruct a base tree...
M	drivers/net/ena/base/ena_eth_com.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/ena/base: coding style changes
Using index info to reconstruct a base tree...
M	drivers/net/ena/base/ena_com.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ena/base/ena_com.c
No changes -- Patch already applied.
Applying: net/ena: separate doorbell logic for Rx and Tx
Using index info to reconstruct a base tree...
M	drivers/net/ena/base/ena_eth_com.h
M	drivers/net/ena/ena_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ena/ena_ethdev.c
No changes -- Patch already applied.
Applying: net/ena: support fragment bypass mode
Using index info to reconstruct a base tree...
M	doc/guides/nics/ena.rst
M	doc/guides/rel_notes/release_25_07.rst
M	drivers/net/ena/base/ena_com.c
M	drivers/net/ena/base/ena_com.h
M	drivers/net/ena/base/ena_defs/ena_admin_defs.h
M	drivers/net/ena/ena_ethdev.c
M	drivers/net/ena/ena_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ena/ena_ethdev.h
Auto-merging drivers/net/ena/ena_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/ena/ena_ethdev.c
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
Auto-merging doc/guides/nics/ena.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 net/ena: support fragment bypass 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".


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

Failed to apply patch:
Applying: net/ena/base: avoid recalculating desc per entry
Applying: net/ena/base: coding style changes
Applying: net/ena: separate doorbell logic for Rx and Tx
Applying: net/ena: support fragment bypass mode
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_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 0004 net/ena: support fragment bypass 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".


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

UNH-IOL DPDK Community Lab