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 8B90B43D47 for ; Mon, 25 Mar 2024 13:08:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85E1640A8A; Mon, 25 Mar 2024 13:08:48 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 7EA174068A for ; Mon, 25 Mar 2024 13:08:47 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-41488e17e1cso4340255e9.0 for ; Mon, 25 Mar 2024 05:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711368527; x=1711973327; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vNvHXICVfR1urFcmmh9Q2NdCvkFr8PD29wHcIB12mNc=; b=HSZAZ/oe3DNuwpSUrGCuWAs2It8r0MAuRB/qRV40Hp5prKwlatM9Wn/pOteoegZBCP 23y3rXsykVqPThz5iXU5HnvCSW1eCUm3oZC3MW6tIWLrLUSp1w9gLUUOnyVzgYhKNbng ZunKOXo/Ts1LrRMNxlhIMIdCSvx6hRPv7QCytJWUQw/Y2a8RIzHSJ8hEXh4NQg1dbFVV oox6gbb6OP+lELjUJpi/DGt7YQVfgFrcAJqqG5NXqg/4sDME6ZPm5Z02BRTnI4Bp9wIQ RimTGnkS0lqu8jbzT1lrEynHx9VF25yh78hFhrhurwc64h21QNXWII0V8vqTOOphGp1S 1ddg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711368527; x=1711973327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNvHXICVfR1urFcmmh9Q2NdCvkFr8PD29wHcIB12mNc=; b=Y049NAww2sJqaxDiXXm+0XL05yteScA7MRPaEj0EEWPljZWUxlxsvQ5b/BBvtMPiio u5F3CtR2WLjCvenrfiVhlDH8xKFt5fr44rTew/FecJV/hQ326hy6vyuZ17TEpMnlTvj/ QtenMTLwesh1g6gSHDOgOJ7QJKFG3ONdMgZ6acVvUiL+BwdWgOCV1O7bcEGvEo5+7ANU 5CY/Vf18YZnHV7etJOVePzJ+VKkyM0XzqgymNG+JE+OAiVjl0UcYIPVnvq+K63eSB7FO C2+8tCTzP40MwTFP69UjSO0yc2MTi0WwUBek2iHX/pR6dP2YMGbzo9de1cla/k3gH6OG CQog== X-Gm-Message-State: AOJu0YzDcBcmWlnmytxb3GHyMdQKVF2fkCLL5xfT+lbsgDb0zak+FcLh UPyAxZ0ilDO5QKks80yUaWURj/6JIxHZV103Npg73dSOcOUha0UcA0x31pvx X-Google-Smtp-Source: AGHT+IE86ZC4olFg510YKg3natQBXpkdV6p2h8xhm4376m3xfEvk2gLVsF12+ed2bCprTMHSjrUPXQ== X-Received: by 2002:a05:600c:5492:b0:414:68ce:3e20 with SMTP id iv18-20020a05600c549200b0041468ce3e20mr5101049wmb.7.1711368526955; Mon, 25 Mar 2024 05:08:46 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c35d000b004147de73a5asm8241122wmq.24.2024.03.25.05.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:08:46 -0700 (PDT) From: luca.boccassi@gmail.com To: Masoumeh Farhadi Nia Cc: dpdk stable Subject: patch 'examples/ipsec-secgw: fix typo in error message' has been queued to stable release 22.11.5 Date: Mon, 25 Mar 2024 12:08:24 +0000 Message-Id: <20240325120824.1104729-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240325120824.1104729-1-luca.boccassi@gmail.com> References: <20240318153919.3407921-28-luca.boccassi@gmail.com> <20240325120824.1104729-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/efe1d783f474ea1668a3e50aac73126b2fb192e0 Thanks. Luca Boccassi --- >From efe1d783f474ea1668a3e50aac73126b2fb192e0 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 918e959344..172e7f2692 100644 --- a/.mailmap +++ b/.mailmap @@ -865,6 +865,7 @@ Martin Weiser Martyna Szapar Maryam Tahhan Masoud Hasanifard +Masoumeh Farhadi Nia Matan Azrad Matej Vido Mateusz Kowalski 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-25 11:28:37.847515265 +0000 +++ 0009-examples-ipsec-secgw-fix-typo-in-error-message.patch 2024-03-25 11:28:37.220389660 +0000 @@ -1 +1 @@ -From 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 Mon Sep 17 00:00:00 2001 +From efe1d783f474ea1668a3e50aac73126b2fb192e0 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 918e959344..172e7f2692 100644 @@ -21,2 +22,2 @@ -@@ -908,6 +908,7 @@ Martin Weiser - Martyna Szapar-Mudlaw +@@ -865,6 +865,7 @@ Martin Weiser + Martyna Szapar