patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Masoumeh Farhadi Nia <masoumeh.farhadinia@gmail.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'examples/ipsec-secgw: fix typo in error message' has been queued to stable release 21.11.7
Date: Thu,  4 Apr 2024 10:51:50 +0100	[thread overview]
Message-ID: <20240404095155.155427-20-ktraynor@redhat.com> (raw)
In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com>

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@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@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@intel.com>
 Maryam Tahhan <maryam.tahhan@intel.com>
 Masoud Hasanifard <masoudhasanifard@gmail.com>
+Masoumeh Farhadi Nia <masoumeh.farhadinia@gmail.com>
 Matan Azrad <matan@nvidia.com> <matan@mellanox.com>
 Matej Vido <matejvido@gmail.com> <vido@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@dpdk.org
@@ -18 +19 @@
-index f3a25a7402..3843868716 100644
+index 055e44f239..434b0b53b7 100644
@@ -21 +22 @@
-@@ -909,4 +909,5 @@ Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@intel.com> <martyna.szapar@intel.co
+@@ -867,4 +867,5 @@ Martyna Szapar <martyna.szapar@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,


  parent reply	other threads:[~2024-04-04  9:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-04  9:51 patch 'net/hns3: enable PFC for all user priorities' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: add traffic manager in features table' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: add link speeds configuration " Kevin Traynor
2024-04-04  9:51 ` patch 'net/ena/base: limit exponential backoff' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/ena/base: restructure interrupt handling' " Kevin Traynor
2024-04-04  9:51 ` patch 'app/testpmd: fix --stats-period option check' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/hns3: support new device' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: update link to Windows DevX in mlx5 guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: prevent ioctl failure log flooding' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix age position in hairpin split' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix drop action release timing' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/mlx5: fix warning about copy length' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/bnxt: fix number of Tx queues being created' " Kevin Traynor
2024-04-04 13:52   ` Kishore Padmanabha
2024-04-04  9:51 ` patch 'doc: fix default IP fragments maximum in programmer guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: fix typo in profiling guide' " Kevin Traynor
2024-04-04  9:51 ` patch 'doc: fix typo in packet framework " Kevin Traynor
2024-04-04  9:51 ` patch 'test/power: fix typo in error message' " Kevin Traynor
2024-04-04  9:51 ` patch 'test/cfgfile: fix typo in error messages' " Kevin Traynor
2024-04-04  9:51 ` Kevin Traynor [this message]
2024-04-04  9:51 ` patch 'net/nfp: fix resource leak for PF initialization' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240404095155.155427-20-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=masoumeh.farhadinia@gmail.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).