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

_apply patch failure_

Submitter: John Daley (johndale) <johndale@cisco.com>
Date: Wednesday, January 26 2022 21:48:02 
Applied on: CommitID:5f6bc8a4edc50ba74eb28f974b6ebacdb799a5db
Apply patch set 106594 failed:

Checking patch doc/guides/nics/features/enic.ini...
error: while searching for:
vxlan                = Y
geneve               = Y
geneve_opt           = Y

[rte_flow actions]
count                = Y

error: patch failed: doc/guides/nics/features/enic.ini:53
Checking patch doc/guides/rel_notes/release_22_03.rst...
error: while searching for:
* **Updated Cisco enic driver.**

  * Added rte_flow support for matching GENEVE packets.

Removed Items
-------------

error: patch failed: doc/guides/rel_notes/release_22_03.rst:58
Checking patch drivers/net/enic/enic_fm_flow.c...
error: while searching for:
static enic_copy_item_fn enic_fm_copy_item_gtp;
static enic_copy_item_fn enic_fm_copy_item_geneve;
static enic_copy_item_fn enic_fm_copy_item_geneve_opt;

/* Ingress actions */
static const enum rte_flow_action_type enic_fm_supported_ig_actions[] = {

error: patch failed: drivers/net/enic/enic_fm_flow.c:237
Hunk #2 succeeded at 368 (offset -25 lines).
Hunk #3 succeeded at 753 (offset -134 lines).
Applying patch doc/guides/nics/features/enic.ini with 1 reject...
Rejected hunk #1.
Applying patch doc/guides/rel_notes/release_22_03.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/enic/enic_fm_flow.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
diff a/doc/guides/nics/features/enic.ini b/doc/guides/nics/features/enic.ini	(rejected hunks)
@@ -53,6 +53,7 @@ vlan                 = Y
 vxlan                = Y
 geneve               = Y
 geneve_opt           = Y
+ecpri                = Y
 
 [rte_flow actions]
 count                = Y
diff a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst	(rejected hunks)
@@ -58,6 +58,7 @@ New Features
 * **Updated Cisco enic driver.**
 
   * Added rte_flow support for matching GENEVE packets.
+  * Added rte_flow support for matching eCPRI packets.
 
 Removed Items
 -------------
diff a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c	(rejected hunks)
@@ -237,6 +237,7 @@ static enic_copy_item_fn enic_fm_copy_item_vxlan;
 static enic_copy_item_fn enic_fm_copy_item_gtp;
 static enic_copy_item_fn enic_fm_copy_item_geneve;
 static enic_copy_item_fn enic_fm_copy_item_geneve_opt;
+static enic_copy_item_fn enic_fm_copy_item_ecpri;
 
 /* Ingress actions */
 static const enum rte_flow_action_type enic_fm_supported_ig_actions[] = {

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

UNH-IOL DPDK Community Lab