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 0620B43B86 for ; Tue, 5 Mar 2024 10:48:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 002E840A72; Tue, 5 Mar 2024 10:48:43 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2069.outbound.protection.outlook.com [40.107.220.69]) by mails.dpdk.org (Postfix) with ESMTP id 11BC24014F for ; Tue, 5 Mar 2024 10:48:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dLena7Uyh7+t33Yf+rOyuUJ+B5Pg00oJz+/CbEhBjMyeVFTaP3T2ezxMhUIvTqRpMAPdGgsU/Gj9UMfr63eTwELTGJ7ylw2qI5Lf5/FNJugb6RE4ld3/jtyIeiNL44QnfQj4TH3emmt3zFV0WH+HbnOWq2Ko0TR6vFCEe8bjjtBV17JdCsoYeuOInWZ15pY5T/zR85lWv90M22DANjH+fJPrxZIr/StATkV68XageUeO0aH3FceMc5eZKrE0Rge8m/1iN9qO21MuU+Wf9zCCYU4LaD36PdvYsga3YvI1rK+SGl72UD3SI8tk4NhPyqIvYh9utkoM+CXmGaQIpPVOng== 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=325323yAlSFy3So/GDAYcKn2HncbbszRtVI/0M7mRMc=; b=Md9+Sn7MOrB/Pfiyry26Zva5ZxjPA4oX9uoj+kirp3ZzLpLMefHlpW04Zm0QQjKysho+dMGYjooCt4CPTq1vpOWDdVv3AS3o/tUBa1Ulc483UTZYrHD/W3CNFfzi3iqiXpq2k5ZsgbTNFZEPlUkdEHXGebt77p+gJMwQJ3blFI5b4hJBIIPVhXo4I4EoB6rl4y3njYZmyUIEj19lhFOLgttHsaZhj3afPepHEB/38omPv6/Ki0MaZuOHs4dDO1vHK7vOQ6vnaXar4QA21cmHRRB9zf80BfFn0EnlFhUT0ZkRDxUKgz97S39Zis3OTRvc2ZUbnzKTiT6jpz/VOfoEqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=325323yAlSFy3So/GDAYcKn2HncbbszRtVI/0M7mRMc=; b=Ks4eKl0GAa1silZhs+x6gy9TFTf/GYynI6DM2ESDigkl7lPN0EaEc6PDonY9VdsitHRW3ozgRA/NcSyH2c2alB+AIdXqcHYiwApvpSP2FKuCerVudPpaUciuHE5lN89AFq+X2X4CPs5LZfNuh/gptU5MPZGXBa3aTrVtgSI1VMaiKSOhsUWypi69u7Tk9KGu5tjvC28WvGkZXHzytddsavIfDJUcN2NDASzZT5qpzf9ZL1eKp+axe4tpFgNDkFLhTwrnRoqitI/K+pQ+XILT2leWR90CVMp3aPNkYG7cNRNSJxgtsfSPNYX9MTraiEvgrHpR54OAQ7IqZduT9YdzIA== Received: from PA7P264CA0266.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:375::6) by MW3PR12MB4489.namprd12.prod.outlook.com (2603:10b6:303:5e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:48:37 +0000 Received: from SN1PEPF0002BA4B.namprd03.prod.outlook.com (2603:10a6:102:375:cafe::87) by PA7P264CA0266.outlook.office365.com (2603:10a6:102:375::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:48:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002BA4B.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:48:35 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:48:16 -0800 Received: from nvidia.com (10.126.231.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; Tue, 5 Mar 2024 01:48:14 -0800 From: Xueming Li To: Bruce Richardson CC: Sunil Kumar Kori , dpdk stable Subject: patch 'buildtools/cmdline: fix generated code for IP addresses' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:45:42 +0800 Message-ID: <20240305094757.439387-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA4B:EE_|MW3PR12MB4489:EE_ X-MS-Office365-Filtering-Correlation-Id: 88d0d130-e9a7-49b6-82ef-08dc3cf96d70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PYlsPc9GLAaC10QjaWbTYyc04/whIRA4fSFXHM/PynZYE1s+cseAbAfr+w8++iTzb7zYUVqs+RniU6F1dTmdWQm6ZoGg/njNXiJVA9SmLV19sTmG6VEgoBaqIEc8eaOmV4q/NfTZdm4JQkw4on6BXf5jcxVFeYMDAIpPpZBNW7UV0BzcMExxzwAqVDzUvvabdXflQTJjwz+Wgi0q/UGjckk1bmPDhB+wHVAaf6HAX8RDuYfcV+oJ7wdtB9JprgaWPihLmYvzq0lWdxDq/RG/gVY6PismLgvry557frIt3JYQe3cnvSr7ECDHfAaOUVYl+bWfvW4u8oZB0SUanQYsM4FYBYqqZ0AJ67DNYz0v+1wfpZIUk2PVcMvB2sJT+ABecmkQzfaNE2xO9Ucknl0EKi8i0R7SsrUEJnBtUPJkF/V8b9AZYzVA9Kj4NoJWV8FC4rh3ukV31K3H17BTOuHEPY0weOkhozEqlRA4WhI9X/7ohK6SU2O2iFRN3AEtrxtNfXqAgtQHBr02v1XKDklXk6/WE+7P87ZrWtoHmE6AP4Rd4B1URBTb9OiIQgoFMKHzo4YEcOiTHau+puotdoDCcX7VYHc5PA524/flBYHtW8N/RoyRzJuA9sgsUF/hrIIXHvC4GdrP/0eKT3najt0FIlshmNyndIHQdZzddVEm4xunx2uJMOl1qrCBzoxdnjMVAMX5ucRJINkeH3QGvgsVJqerWBs+p3avlnCOFP52Lg0rI6a0xgN0+P6phAD+oj0N X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:48:35.8974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88d0d130-e9a7-49b6-82ef-08dc3cf96d70 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA4B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4489 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 03/31/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=3cedd8b9e4617682700bc3a712edfb19964cd302 Thanks. Xueming Li --- >From 3cedd8b9e4617682700bc3a712edfb19964cd302 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 5 Dec 2023 11:31:04 +0000 Subject: [PATCH] buildtools/cmdline: fix generated code for IP addresses Cc: Xueming Li [ upstream commit a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac ] The C code generated for the tokens for matching IP addresses in commandlines was missing the "static" prefix present in the output for the other data-types. Fixes: 37666691e9ed ("buildtools: add a tool to generate cmdline boilerplate") Reported-by: Sunil Kumar Kori Signed-off-by: Bruce Richardson Acked-by: Sunil Kumar Kori --- buildtools/dpdk-cmdline-gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/dpdk-cmdline-gen.py b/buildtools/dpdk-cmdline-gen.py index 49b03bee4a..bf1253d949 100755 --- a/buildtools/dpdk-cmdline-gen.py +++ b/buildtools/dpdk-cmdline-gen.py @@ -71,7 +71,7 @@ def process_command(lineno, tokens, comment): elif t_type in ["IP", "IP_ADDR", "IPADDR"]: result_struct.append(f"\tcmdline_ipaddr_t {t_name};") initializers.append( - f"cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n" + f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n" f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});" ) elif t_type.startswith("(") and t_type.endswith(")"): -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.152339106 +0800 +++ 0001-buildtools-cmdline-fix-generated-code-for-IP-address.patch 2024-03-05 17:39:30.633566488 +0800 @@ -1 +1 @@ -From a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac Mon Sep 17 00:00:00 2001 +From 3cedd8b9e4617682700bc3a712edfb19964cd302 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a78b8f11dc1093cd1dc25bb4bcdde63b5dccb4ac ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org