|WARNING| pw139185 [PATCH] [v2, 1/1] net/ena/base: fix metrics excessive memory consumption

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Brandes, Shai <shaibran at amazon.com>
Date: Monday, April 08 2024 12:15:25 
Applied on: CommitID:e2e546ab5bf5e024986ccb5310ab43982f3bb40c
Apply patch set 139185 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 (e2e546ab5bf5e024986ccb5310ab43982f3bb40c)
Done: main commit e2e546ab5bf5e024986ccb5310ab43982f3bb40c
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (e2e546ab5bf5e024986ccb5310ab43982f3bb40c)
Applying patch...

Failed to apply patch:
Applying: net/ena/base: fix metrics excessive memory consumption
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
CONFLICT (content): Merge conflict in drivers/net/ena/base/ena_com.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ena/base: fix metrics excessive memory consumption
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 (e2e546ab5bf5e024986ccb5310ab43982f3bb40c)
Applying patch...

Failed to apply patch:
Applying: net/ena/base: fix metrics excessive memory consumption
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
CONFLICT (content): Merge conflict in drivers/net/ena/base/ena_com.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ena/base: fix metrics excessive memory consumption
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/29739/

UNH-IOL DPDK Community Lab