From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5543243DF8 for ; Thu, 4 Apr 2024 11:52:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BF4240695; Thu, 4 Apr 2024 11:52:49 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9DC094068E for ; Thu, 4 Apr 2024 11:52:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+343ZT53kBfnxqUsUoLsAEa43TO6YVda5fCqNpgqQ1U=; b=KNJ7AjBEtA5SHZLsHDo/gJAlrjx61K2aSvCQ6tHPtBuKvc9gfBIhmSYmjZlGYn7diIb1L+ voF0BNwbhQ8Mdn8HQ1PMU6/05nTN4UOcQwAXMLz3k7uZ+hJA7BYUuLIf08Dc1nki2pFGSX KflhicWmbL8NSK4V/JHqWDDPOD+t/5A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-408-KNqVfFaGMSa-QFlL_9mYAw-1; Thu, 04 Apr 2024 05:52:44 -0400 X-MC-Unique: KNqVfFaGMSa-QFlL_9mYAw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57B19101A531; Thu, 4 Apr 2024 09:52:44 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC8894853; Thu, 4 Apr 2024 09:52:43 +0000 (UTC) From: Kevin Traynor To: Masoumeh Farhadi Nia Cc: dpdk stable 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 Message-ID: <20240404095155.155427-20-ktraynor@redhat.com> In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com> References: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 --- .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 Maryam Tahhan Masoud Hasanifard +Masoumeh Farhadi Nia Matan Azrad Matej Vido 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 @@ -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,