|WARNING| pw136424 [PATCH] examples/ipsec-secgw: fix IPsec performance drop

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali at marvell.com>
Date: Tuesday, February 06 2024 12:38:11 
Applied on: CommitID:a4ce111cc89f580b8c4aad51bdb061acbdfde86b
Apply patch set 136424 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (a4ce111cc89f580b8c4aad51bdb061acbdfde86b)
Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b
Trying to checkout branch: main
Checked out to main (a4ce111cc89f580b8c4aad51bdb061acbdfde86b)
Applying patch...

Failed to apply patch:
Applying: examples/ipsec-secgw: fix IPsec performance drop
Using index info to reconstruct a base tree...
M	examples/ipsec-secgw/ipsec-secgw.h
Falling back to patching base and 3-way merge...
Auto-merging examples/ipsec-secgw/ipsec-secgw.h
CONFLICT (content): Merge conflict in examples/ipsec-secgw/ipsec-secgw.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 examples/ipsec-secgw: fix IPsec performance drop
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/29056/

UNH-IOL DPDK Community Lab