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

_apply patch failure_

Submitter: Michael Baum <michaelba@nvidia.com>
Date: Sunday, February 27 2022 07:57:53 
Applied on: CommitID:35cb5bd236301277d7fa7c571cfa57c07f5322af
Apply patch set 108372 failed:

Checking patch drivers/common/mlx5/mlx5_common.c...
error: while searching for:
	};
	int ret = 0;

	if (mkvlist == NULL)
		return 0;
	/* Set defaults. */
	config->mr_ext_memseg_en = 1;
	config->mr_mempool_reg_en = 1;

error: patch failed: drivers/common/mlx5/mlx5_common.c:326
error: while searching for:
	config->dbnc = MLX5_ARG_UNSET;
	config->device_fd = MLX5_ARG_UNSET;
	config->pd_handle = MLX5_ARG_UNSET;
	/* Process common parameters. */
	ret = mlx5_kvargs_process(mkvlist, params,
				  mlx5_common_args_check_handler, config);

error: patch failed: drivers/common/mlx5/mlx5_common.c:335
Applying patch drivers/common/mlx5/mlx5_common.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c	(rejected hunks)
@@ -326,8 +326,6 @@ mlx5_common_config_get(struct mlx5_kvargs_ctrl *mkvlist,
 	};
 	int ret = 0;
 
-	if (mkvlist == NULL)
-		return 0;
 	/* Set defaults. */
 	config->mr_ext_memseg_en = 1;
 	config->mr_mempool_reg_en = 1;
@@ -335,6 +333,8 @@ mlx5_common_config_get(struct mlx5_kvargs_ctrl *mkvlist,
 	config->dbnc = MLX5_ARG_UNSET;
 	config->device_fd = MLX5_ARG_UNSET;
 	config->pd_handle = MLX5_ARG_UNSET;
+	if (mkvlist == NULL)
+		return 0;
 	/* Process common parameters. */
 	ret = mlx5_kvargs_process(mkvlist, params,
 				  mlx5_common_args_check_handler, config);

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

UNH-IOL DPDK Community Lab