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 C66DD43E57 for ; Sat, 13 Apr 2024 15:01:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9E2840294; Sat, 13 Apr 2024 15:01:38 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2082.outbound.protection.outlook.com [40.107.102.82]) by mails.dpdk.org (Postfix) with ESMTP id E3D45400D6 for ; Sat, 13 Apr 2024 15:01:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wtj0gOBjX6aInacu6YxtpkIWsrtjhzJqjqTt2srMZp+2kohmdZov+mGxy/8czzjOE1amCxROJKaxJswbViWk5ZMJKg51MrR3msiu514p1pX2jHIWm8LOu7nakNgrJ50rE9QTwW07MRHH2Bqhe6X7sNnnewfFgY5URTFib++kBxbZ8Q+4dSp244nf1XF1YO4d7e9AsTLH+eP8BUSZFzzwTfDza66QXFTi9Y4cGjBtnFx0fpS1+pS1QT4+srihjSLVVh5ScYCLzeG/aD6EkNmx9pPhqXFsOdXt/3iuTSePrMnaye9aShulJBn9+51pKimrT5Pmt0ORBHV0RQSUqhMpAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZwopTOqvMNKXYb+yRth5qlhjreJoUdnO0mR4/VgPkRU=; b=EkbhVh/rFjYp6K+HE97JBOYLSsaZ++LacvPDJoBZId2eB35I80SJA7MelUU1eQ2WWDY9DrZepyf1SoddAMFf3RjJHBtcyggWRRSupfGWO838BtssaGeUbMEujKlIwHDO/jhOjFPOF7XMfvxoT0Elk1ga+Ak6Xj0vM5XcF44jgwnE/6r4FUinbUQ4muiakkXTyx6Kbd63lAmvTsvwQQVqd7Ui/dePWzGf9c0Atpx7tLJfL2dHBs++FqEXtjc7c2JtuO0gbl0+z82gGFPNnXYIEPB4GrXYaSWbjJVqMpF56rNQFyeyDP/pI3toP2z+Uy1wScv6Vvlpp3BowSROXClVLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=gmail.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZwopTOqvMNKXYb+yRth5qlhjreJoUdnO0mR4/VgPkRU=; b=YeLt7HEkM3lRtUq6DX6QuN/KH91ZQH5qYp+HqJ6Gy0J7i5oZS7SXTYXzHqBFDevj80gxCLFlrUqDI1Rt79163oXcA8iaP+RYeWif4Of4LaMA22XE6P7q8PFvJ0NA1D+Wc27xhYsU7oILqRKYFK8FwConn7EB6v960W0To6hQlc2xifquznaPI5vWVHsq24tI9ZieA0DJYypGEztNgg0DQE6TLwwdJ0ifYL41EWHYkZT2/foSGGxwXOy39akdg22XZhEyKpUpqYehBprIguIO2TjrKatqN1UEcr8V3XIqdf9e26fG00mzepD2/KADh0SshpcyMbE2VRBYHmx7hMobGQ== Received: from BYAPR07CA0033.namprd07.prod.outlook.com (2603:10b6:a02:bc::46) by SN7PR12MB7178.namprd12.prod.outlook.com (2603:10b6:806:2a6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 13:01:32 +0000 Received: from MWH0EPF000A672E.namprd04.prod.outlook.com (2603:10b6:a02:bc:cafe::bf) by BYAPR07CA0033.outlook.office365.com (2603:10b6:a02:bc::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.29 via Frontend Transport; Sat, 13 Apr 2024 13:01:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000A672E.mail.protection.outlook.com (10.167.249.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 13:01:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 06:01:13 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 06:01:12 -0700 From: Xueming Li To: Masoumeh Farhadi Nia CC: dpdk stable Subject: patch 'examples/ipsec-secgw: fix typo in error message' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:50:03 +0800 Message-ID: <20240413125005.725659-123-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000A672E:EE_|SN7PR12MB7178:EE_ X-MS-Office365-Filtering-Correlation-Id: d16eb703-4a16-4daa-21e2-08dc5bb9d7af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wIVMc9sGgmirZWtDSF+HYFmwK8L8MEQ1szcFi0dyo+gj/UL/h635fypjJA1nDcdP0wZhTQQxv7r5oQ+34EqpxG/xLg94piiILBMRUo8kNGlwilyOI7yRvPoaYUJVDnCsu5JE0J/7nIUn3Xxhl+kV6+qVlj5LE1qz4JnMnGvFq2gjPFtLfEDgwEM2UU26enlhmf6WVKhT8O4dVb2vyF5h29IGyyLwpIIwmBZx3C+CxLc79VGDyXiB1ZJ6bxNxKdurf/SjXHS22guYEpBl8FK99zxHECv9LixNgpp8PkmErBsE52clXPKEuO4YbRbUitlhjcW9tTQgCPdUWxqEO+Kksxv/Zv7ZV6sxCjPay2LmT4QxvfKEqJKn9GelrAZ/lED/xBWmvA3+RhQP31/sTMhMl6aL8RDMmGZIQPuGOUAiy89NgZ6yyLNzy1cCOhCBVA32EjqlBoa/24iTxcLoHWi3MvElBtyNyJoTqRwHEGAzqoxUXDh42qNz2Qfoka8ed7oWtGE+y6oFjXJZ1KibGhy5Vjm0fclQ1M+bAk+bLwAOf6rUJROswf0IYTroPOMjGc1rjAn5KuZIFG32CN5s/f9YC3A6K5xKc6TY+HHo4PygjGKrphfcPfTjcMOaT7G5GrQjDfTv+aV0IjIvz61ozLazkvDE++GuRexPk3sNBdf0dXNReZQOt2Gpu2+zuVw7JY+1i6E+upZE/EpwM1B7ZrFOlGYn9Le1AY3XGUUMonoCbSHXNusSruwh1uSf09DURx56 X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 13:01:32.4486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d16eb703-4a16-4daa-21e2-08dc5bb9d7af X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A672E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7178 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 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 --- >From abc68161348cb4242069279f9d068044d9219442 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 Cc: Xueming Li [ 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 6e34fe6566..f3b429b747 100644 --- a/.mailmap +++ b/.mailmap @@ -901,6 +901,7 @@ Martin Weiser Martyna Szapar-Mudlaw 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.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 + +[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index f3a25a7402..3843868716 100644 +index 6e34fe6566..f3b429b747 100644 @@ -21 +23 @@ -@@ -908,6 +908,7 @@ Martin Weiser +@@ -901,6 +901,7 @@ Martin Weiser