|WARNING| pw153807-153813 [PATCH] [v4, 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/153813

_apply patch failure_

Submitter: Shai Brandes <shaibran@amazon.com>
Date: Wednesday, May 28 2025 10:28:06 
Applied on: CommitID:a633a128fd09ff1fc72312f4e4d1a9e0f73aa359
Apply patch set 153807-153813 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 (a633a128fd09ff1fc72312f4e4d1a9e0f73aa359)
Done: main commit a633a128fd09ff1fc72312f4e4d1a9e0f73aa359
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (466db466e2938c0d4e7f3dd75435483133f98770)
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".


Trying to checkout branch: origin/main
Checked out to main (a633a128fd09ff1fc72312f4e4d1a9e0f73aa359)
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/33265/

UNH-IOL DPDK Community Lab