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

_apply patch failure_

Submitter: Hamdan Igbaria <hamdani@nvidia.com>
Date: Thursday, February 02 2023 16:02:59 
Applied on: CommitID:5003661613fa7663347b7ea75f2560b8a6458a30
Apply patch set 122965-122969 failed:

Checking patch drivers/net/mlx5/hws/mlx5dr_debug.c...
error: while searching for:
		ste_1 = NULL;
	}

	ret = fprintf(f, ",%d,%d,%d,%d,%d",
		      matcher->match_ste.rtc_0 ? matcher->match_ste.rtc_0->id : 0,
		      ste_0 ? (int)ste_0->id : -1,
		      matcher->match_ste.rtc_1 ? matcher->match_ste.rtc_1->id : 0,
		      ste_1 ? (int)ste_1->id : -1,
		      is_shared && !is_root ?
		      matcher->match_ste.aliased_rtc_0->id : 0);
	if (ret < 0)
		goto out_err;


error: patch failed: drivers/net/mlx5/hws/mlx5dr_debug.c:208
Hunk #2 succeeded at 224 (offset -3 lines).
Applying patch drivers/net/mlx5/hws/mlx5dr_debug.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
diff a/drivers/net/mlx5/hws/mlx5dr_debug.c b/drivers/net/mlx5/hws/mlx5dr_debug.c	(rejected hunks)
@@ -208,13 +208,11 @@ static int mlx5dr_debug_dump_matcher(FILE *f, struct mlx5dr_matcher *matcher)
 		ste_1 = NULL;
 	}
 
-	ret = fprintf(f, ",%d,%d,%d,%d,%d",
+	ret = fprintf(f, ",%d,%d,%d,%d",
 		      matcher->match_ste.rtc_0 ? matcher->match_ste.rtc_0->id : 0,
 		      ste_0 ? (int)ste_0->id : -1,
 		      matcher->match_ste.rtc_1 ? matcher->match_ste.rtc_1->id : 0,
-		      ste_1 ? (int)ste_1->id : -1,
-		      is_shared && !is_root ?
-		      matcher->match_ste.aliased_rtc_0->id : 0);
+		      ste_1 ? (int)ste_1->id : -1);
 	if (ret < 0)
 		goto out_err;
 
Checking patch drivers/net/mlx5/hws/mlx5dr_debug.c...
error: drivers/net/mlx5/hws/mlx5dr_debug.c: does not match index
Checking patch drivers/net/mlx5/hws/mlx5dr_debug.h...
Applied patch drivers/net/mlx5/hws/mlx5dr_debug.h cleanly.

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

UNH-IOL DPDK Community Lab