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

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

[qemudev]

Test-Label: loongarch-compilation
Test-Status: WARNING
http://dpdk.org/patch/138109

_apply patch failure_

Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu,  7 Mar 2024 11:14:59 -0800
DPDK git baseline: Repo:dpdk
  Branch: main
  CommitID: 6bd7a4b20c17a7a26277c2590816413dd48691d4

Apply patch set 138109 failed:

Checking patch lib/hash/rte_thash_gfni.c...
error: while searching for:
#include <rte_log.h>
#include <rte_thash_gfni.h>

#ifndef RTE_THASH_GFNI_DEFINED

RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
#define RTE_LOGTYPE_HASH hash_gfni_logtype
#define HASH_LOG(level, ...) \
	RTE_LOG_LINE(level, HASH, "" __VA_ARGS__)

uint32_t
rte_thash_gfni(const uint64_t *mtrx __rte_unused,
	const uint8_t *key __rte_unused, int len __rte_unused)
{
	static bool warned;

error: patch failed: lib/hash/rte_thash_gfni.c:7
error: lib/hash/rte_thash_gfni.c: patch does not apply
Checking patch lib/hash/rte_thash_gfni.h...
error: while searching for:
extern "C" {
#endif

#include <rte_log.h>

#ifdef RTE_ARCH_X86


error: patch failed: lib/hash/rte_thash_gfni.h:9
error: lib/hash/rte_thash_gfni.h: patch does not apply
Checking patch lib/hash/version.map...
error: while searching for:
	rte_thash_get_gfni_matrices;
	rte_thash_get_helper;
	rte_thash_get_key;
	rte_thash_gfni;
	rte_thash_gfni_bulk;
	rte_thash_gfni_supported;
	rte_thash_init_ctx;

	local: *;
};

error: patch failed: lib/hash/version.map:41
error: lib/hash/version.map: patch does not apply

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

[checkpatch]

Test-Label: checkpatch
Test-Status: SUCCESS
http://dpdk.org/patch/138109

_coding style OK_

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

[dpdklab]

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

_apply patch failure_

Submitter: Stephen Hemminger <stephen@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