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

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:50:03 CEST 2024


Hi,

FYI, your patch has been queued to stable release 23.11.1

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/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=abc68161348cb4242069279f9d068044d9219442

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From abc68161348cb4242069279f9d068044d9219442 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 6e34fe6566..f3b429b747 100644
--- a/.mailmap
+++ b/.mailmap
@@ -901,6 +901,7 @@ Martin Weiser <martin.weiser at allegro-packets.com>
 Martyna Szapar-Mudlaw <martyna.szapar-mudlaw at intel.com> <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>
 Mateusz Kowalski <mateusz.kowalski at intel.com>
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 98f8176651..2bd6df335b 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -388,7 +388,7 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
 	rc = parse_mac(res->mac, &mac);
 	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.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:08.783850286 +0800
+++ 0123-examples-ipsec-secgw-fix-typo-in-error-message.patch	2024-04-13 20:43:05.157753723 +0800
@@ -1 +1 @@
-From 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 Mon Sep 17 00:00:00 2001
+From abc68161348cb4242069279f9d068044d9219442 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index f3a25a7402..3843868716 100644
+index 6e34fe6566..f3b429b747 100644
@@ -21 +23 @@
-@@ -908,6 +908,7 @@ Martin Weiser <martin.weiser at allegro-packets.com>
+@@ -901,6 +901,7 @@ Martin Weiser <martin.weiser at allegro-packets.com>


More information about the stable mailing list