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

_apply patch failure_

Submitter: Andrew Rybchenko <Andrew.Rybchenko@oktetlabs.ru>
Date: Tuesday, October 04 2022 09:02:57 
Applied on: CommitID:fe1a5a9b42f33a4cbfea741d03179557c03acd18
Apply patch set 117283 failed:

Checking patch doc/guides/nics/features.rst...
Checking patch doc/guides/nics/features/default.ini...
Checking patch doc/guides/rel_notes/release_22_11.rst...
error: while searching for:
  Added new rte_flow action which allows application to re-route packets
  directly to the kernel without software involvement.

* **Updated Intel iavf driver.**

  * Added flow subscription support.

error: patch failed: doc/guides/rel_notes/release_22_11.rst:78
Checking patch lib/ethdev/ethdev_driver.h...
Checking patch lib/ethdev/ethdev_private.h...
Checking patch lib/ethdev/meson.build...
Checking patch lib/ethdev/rte_cman.h...
Checking patch lib/ethdev/rte_ethdev.c...
Hunk #1 succeeded at 643 (offset 1 line).
Checking patch lib/ethdev/rte_ethdev.h...
Checking patch lib/ethdev/rte_ethdev_cman.c...
Checking patch lib/ethdev/version.map...
error: while searching for:
	rte_mtr_meter_vlan_table_update;

	# added in 22.11
	rte_flow_async_action_handle_query;
	rte_mtr_meter_policy_get;
	rte_mtr_meter_profile_get;

error: patch failed: lib/ethdev/version.map:287
Applied patch doc/guides/nics/features.rst cleanly.
Applied patch doc/guides/nics/features/default.ini cleanly.
Applying patch doc/guides/rel_notes/release_22_11.rst with 1 reject...
Rejected hunk #1.
Applied patch lib/ethdev/ethdev_driver.h cleanly.
Applied patch lib/ethdev/ethdev_private.h cleanly.
Applied patch lib/ethdev/meson.build cleanly.
Applied patch lib/ethdev/rte_cman.h cleanly.
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applied patch lib/ethdev/rte_ethdev.h cleanly.
Applied patch lib/ethdev/rte_ethdev_cman.c cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst	(rejected hunks)
@@ -78,6 +78,12 @@ New Features
   Added new rte_flow action which allows application to re-route packets
   directly to the kernel without software involvement.
 
+* **Added support for congestion management for ethdev.**
+
+  Added new APIs ``rte_eth_cman_config_init()``, ``rte_eth_cman_config_get()``,
+  ``rte_eth_cman_config_set()``, ``rte_eth_cman_info_get()``
+  to support congestion management.
+
 * **Updated Intel iavf driver.**
 
   * Added flow subscription support.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -287,6 +287,10 @@ EXPERIMENTAL {
 	rte_mtr_meter_vlan_table_update;
 
 	# added in 22.11
+	rte_eth_cman_config_get;
+	rte_eth_cman_config_init;
+	rte_eth_cman_config_set;
+	rte_eth_cman_info_get;
 	rte_flow_async_action_handle_query;
 	rte_mtr_meter_policy_get;
 	rte_mtr_meter_profile_get;

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

UNH-IOL DPDK Community Lab