|WARNING| pw138109 [PATCH] [v4] hash: put GFNI stubs back

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Stephen Hemminger <stephen at networkplumber.org>
Date: Thursday, March 07 2024 19:14:59 
Applied on: CommitID:6bd7a4b20c17a7a26277c2590816413dd48691d4
Apply patch set 138109 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 (6bd7a4b20c17a7a26277c2590816413dd48691d4)
Done: main commit 6bd7a4b20c17a7a26277c2590816413dd48691d4
Trying to checkout branch: origin/main
Checked out to main (6bd7a4b20c17a7a26277c2590816413dd48691d4)
Applying patch...

Failed to apply patch:
Applying: hash: put GFNI stubs back
Using index info to reconstruct a base tree...
M	lib/hash/rte_thash_gfni.c
M	lib/hash/rte_thash_gfni.h
M	lib/hash/version.map
Falling back to patching base and 3-way merge...
Auto-merging lib/hash/version.map
CONFLICT (content): Merge conflict in lib/hash/version.map
Auto-merging lib/hash/rte_thash_gfni.h
CONFLICT (content): Merge conflict in lib/hash/rte_thash_gfni.h
Auto-merging lib/hash/rte_thash_gfni.c
CONFLICT (content): Merge conflict in lib/hash/rte_thash_gfni.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 hash: put GFNI stubs back
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/29467/

UNH-IOL DPDK Community Lab