patch 'examples/ipsec-secgw: fix typo in error message' has been queued to stable release 21.11.7

Kevin Traynor ktraynor at redhat.com
Thu Apr 4 11:51:50 CEST 2024


Hi,

FYI, your patch has been queued to stable release 21.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/09/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/aa99de99938079b321bac76f979cfc22ba5593b7

Thanks.

Kevin

---
>From aa99de99938079b321bac76f979cfc22ba5593b7 Mon Sep 17 00:00:00 2001
From: Masoumeh Farhadi Nia <masoumeh.farhadinia at gmail.com>
Date: Thu, 21 Mar 2024 18:41:35 -0400
Subject: [PATCH] examples/ipsec-secgw: fix typo in error message

[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ]

Caught by codespell.

Fixes: 7622291b641d ("examples/ipsec-secgw: allow to specify neighbour MAC address")

Signed-off-by: Masoumeh Farhadi Nia <masoumeh.farhadinia at gmail.com>
---
 .mailmap                      | 1 +
 examples/ipsec-secgw/parser.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 055e44f239..434b0b53b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -867,4 +867,5 @@ Martyna Szapar <martyna.szapar at intel.com>
 Maryam Tahhan <maryam.tahhan at intel.com>
 Masoud Hasanifard <masoudhasanifard at gmail.com>
+Masoumeh Farhadi Nia <masoumeh.farhadinia at gmail.com>
 Matan Azrad <matan at nvidia.com> <matan at mellanox.com>
 Matej Vido <matejvido at gmail.com> <vido at cesnet.cz>
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 98dff93b87..f49f8ede6d 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -388,5 +388,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
 	APP_CHECK(rc == 0, st, "invalid ether addr:%s", res->mac);
 	rc = add_dst_ethaddr(res->port, &mac);
-	APP_CHECK(rc == 0, st, "invalid port numer:%hu", res->port);
+	APP_CHECK(rc == 0, st, "invalid port number:%hu", res->port);
 	if (st->status < 0)
 		return;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.505566289 +0100
+++ 0020-examples-ipsec-secgw-fix-typo-in-error-message.patch	2024-04-04 10:49:33.768457785 +0100
@@ -1 +1 @@
-From 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 Mon Sep 17 00:00:00 2001
+From aa99de99938079b321bac76f979cfc22ba5593b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index f3a25a7402..3843868716 100644
+index 055e44f239..434b0b53b7 100644
@@ -21 +22 @@
-@@ -909,4 +909,5 @@ Martyna Szapar-Mudlaw <martyna.szapar-mudlaw at intel.com> <martyna.szapar at intel.co
+@@ -867,4 +867,5 @@ Martyna Szapar <martyna.szapar at intel.com>
@@ -28 +29 @@
-index 98f8176651..2bd6df335b 100644
+index 98dff93b87..f49f8ede6d 100644
@@ -31 +32 @@
-@@ -389,5 +389,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
+@@ -388,5 +388,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,



More information about the stable mailing list