|WARNING| pw131590 [PATCH] [v2] net/mlx5: reuse reformat and modify header actions in a table

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Gregory Etelson <getelson at nvidia.com>
Date: Tuesday, September 19 2023 07:29:08 
Applied on: CommitID:eb06c6f2b9d4834e926c3a588b7d91ee63bfc610
Apply patch set 131590 failed:

Checking patch drivers/net/mlx5/mlx5_flow.h...
Hunk #1 succeeded at 1319 (offset 1 line).
Hunk #2 succeeded at 1335 (offset 1 line).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
error: while searching for:
	uint16_t action_pos;
	uint16_t jump_pos;
	uint32_t ct_idx;
	int err;
	uint32_t target_grp = 0;

	flow_hw_modify_field_init(&mhdr, at);

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:1437
Hunk #8 succeeded at 1817 (offset 1 line).
Hunk #9 succeeded at 1860 (offset 1 line).
Hunk #10 succeeded at 2019 (offset 4 lines).
Hunk #11 succeeded at 2061 (offset 4 lines).
Hunk #12 succeeded at 3584 (offset 4 lines).
Hunk #13 succeeded at 3873 (offset 4 lines).
Hunk #14 succeeded at 3892 (offset 4 lines).
Hunk #15 succeeded at 4134 (offset 4 lines).
Hunk #16 succeeded at 4498 (offset 4 lines).
Hunk #17 succeeded at 4760 (offset 10 lines).
Applied patch drivers/net/mlx5/mlx5_flow.h cleanly.
Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly.
Applying patch drivers/net/mlx5/mlx5_flow_hw.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Hunk #17 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c	(rejected hunks)
@@ -1437,7 +1682,7 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,
 	uint16_t action_pos;
 	uint16_t jump_pos;
 	uint32_t ct_idx;
-	int err;
+	int ret, err;
 	uint32_t target_grp = 0;
 
 	flow_hw_modify_field_init(&mhdr, at);

https://lab.dpdk.org/results/dashboard/patchsets/27639/

UNH-IOL DPDK Community Lab