|WARNING| pw111740-111744 [PATCH] [v3, 7/7] app/testpmd: add LWM and Host Shaper command

|WARNING| pw111740-111744 [PATCH] [v3, 7/7] app/testpmd: add LWM and Host Shaper command

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3008 bytes --]

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

_apply patch failure_

Submitter: Spike Du <spiked@nvidia.com>
Date: Tuesday, May 24 2022 15:20:41 
Applied on: CommitID:981a025741f80b4036f994ed30b04e757299ab19
Apply patch set 111740-111744 failed:

Checking patch lib/ethdev/ethdev_driver.h...
Checking patch lib/ethdev/rte_ethdev.c...
Hunk #1 succeeded at 4429 (offset 5 lines).
Checking patch lib/ethdev/rte_ethdev.h...
Hunk #2 succeeded at 3676 (offset -4 lines).
Hunk #3 succeeded at 3939 (offset -4 lines).
Checking patch lib/ethdev/version.map...
error: while searching for:
	rte_mtr_color_in_protocol_priority_get;
	rte_mtr_color_in_protocol_set;
	rte_mtr_meter_vlan_table_update;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:285
Applied patch lib/ethdev/ethdev_driver.h cleanly.
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applied patch lib/ethdev/rte_ethdev.h cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -285,6 +285,8 @@ EXPERIMENTAL {
 	rte_mtr_color_in_protocol_priority_get;
 	rte_mtr_color_in_protocol_set;
 	rte_mtr_meter_vlan_table_update;
+	rte_eth_rx_lwm_set;
+	rte_eth_rx_lwm_query;
 };
 
 INTERNAL {
Checking patch app/test-pmd/cmdline.c...
Hunk #2 succeeded at 17806 (offset -1 lines).
Hunk #3 succeeded at 18159 (offset -2 lines).
Checking patch app/test-pmd/config.c...
.git/rebase-apply/patch:141: new blank line at EOF.
+
Checking patch app/test-pmd/meson.build...
Checking patch app/test-pmd/testpmd.c...
error: while searching for:
#ifdef RTE_NET_BOND
#include <rte_eth_bond.h>
#endif

#include "testpmd.h"


error: patch failed: app/test-pmd/testpmd.c:69
Hunk #2 succeeded at 417 (offset -6 lines).
Hunk #3 succeeded at 3552 (offset -68 lines).
Hunk #4 succeeded at 3587 (offset -68 lines).
Checking patch app/test-pmd/testpmd.h...
Hunk #1 succeeded at 1163 (offset -3 lines).
Checking patch doc/guides/nics/mlx5.rst...
.git/rebase-apply/patch:275: new blank line at EOF.
+
Hunk #1 succeeded at 1716 (offset -2 lines).
Checking patch drivers/net/mlx5/mlx5_testpmd.c...
Checking patch drivers/net/mlx5/mlx5_testpmd.h...
Applied patch app/test-pmd/cmdline.c cleanly.
Applied patch app/test-pmd/config.c cleanly.
Applied patch app/test-pmd/meson.build cleanly.
Applying patch app/test-pmd/testpmd.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Applied patch app/test-pmd/testpmd.h cleanly.
Applied patch doc/guides/nics/mlx5.rst cleanly.
Applied patch drivers/net/mlx5/mlx5_testpmd.c cleanly.
Applied patch drivers/net/mlx5/mlx5_testpmd.h cleanly.
diff a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c	(rejected hunks)
@@ -69,6 +69,9 @@
 #ifdef RTE_NET_BOND
 #include <rte_eth_bond.h>
 #endif
+#ifdef RTE_NET_MLX5
+#include "mlx5_testpmd.h"
+#endif
 
 #include "testpmd.h"
 

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

UNH-IOL DPDK Community Lab