|WARNING| pw125358 [PATCH] [v2] common/idpf: move PF specific functions from common init

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Xing, Beilei <beilei.xing at intel.com>
Date: Tuesday, March 21 2023 07:07:03 
Applied on: CommitID:33949800f1afcb7527b6e36c60c1548687ccb673
Apply patch set 125358 failed:

Checking patch drivers/common/idpf/idpf_common_device.c...
Checking patch drivers/common/idpf/idpf_common_device.h...
Checking patch drivers/common/idpf/version.map...
Checking patch drivers/net/cpfl/cpfl_ethdev.c...
error: while searching for:
	rte_eal_alarm_cancel(cpfl_dev_alarm_handler, adapter);
	idpf_adapter_deinit(base);
err_adapter_init:
	return ret;
}


error: patch failed: drivers/net/cpfl/cpfl_ethdev.c:1213
Hunk #4 succeeded at 1337 (offset -3 lines).
Checking patch drivers/net/idpf/idpf_ethdev.c...
error: while searching for:
	rte_eal_alarm_cancel(idpf_dev_alarm_handler, adapter);
	idpf_adapter_deinit(base);
err_adapter_init:
	return ret;
}


error: patch failed: drivers/net/idpf/idpf_ethdev.c:1175
Hunk #4 succeeded at 1358 (offset -3 lines).
Applied patch drivers/common/idpf/idpf_common_device.c cleanly.
Applied patch drivers/common/idpf/idpf_common_device.h cleanly.
Applied patch drivers/common/idpf/version.map cleanly.
Applying patch drivers/net/cpfl/cpfl_ethdev.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Applying patch drivers/net/idpf/idpf_ethdev.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c	(rejected hunks)
@@ -1213,6 +1228,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a
 	rte_eal_alarm_cancel(cpfl_dev_alarm_handler, adapter);
 	idpf_adapter_deinit(base);
 err_adapter_init:
+	idpf_hw_mbx_deinit(hw);
+err_reset_check:
 	return ret;
 }
 
diff a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c	(rejected hunks)
@@ -1175,6 +1223,8 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *a
 	rte_eal_alarm_cancel(idpf_dev_alarm_handler, adapter);
 	idpf_adapter_deinit(base);
 err_adapter_init:
+	idpf_hw_mbx_deinit(hw);
+err_reset_check:
 	return ret;
 }
 

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

UNH-IOL DPDK Community Lab