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 D7CBE43B86 for ; Tue, 5 Mar 2024 10:48:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3A2E4026B; Tue, 5 Mar 2024 10:48:42 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2084.outbound.protection.outlook.com [40.107.220.84]) by mails.dpdk.org (Postfix) with ESMTP id CBBC7402A8 for ; Tue, 5 Mar 2024 10:48:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R9MbLK4NoqEAxjmc9o8vnKAE0rKRMPYuZnTH7HF/lSWj3dQ4GGrvRrlwCKQZQn87iRH57mwlmYziPSvJUvaGB7lk8oAvqJlerzoV1PWuEsApaga7oNKOAIrfmarbSdbH61JCFiVfmeB+1mYQFJhe70RGk4AsOsmA7zvwNVATZdoZmXqbHhrLkCG2WslVdaBFrTmx7DdojQh7NPLmrREDymL/uaGVKftfyfYHoIgSJdhxTGorjy0Mhpc13u66zar4ngyrQm5NOaMw3Ne3a4qgYYuOHNck7gySUa529Uys+46HW9atm1979unv7YDxNtbQKDjrt8oEQtjPfGR4V+NmkA== 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=XnCdC7ormYNqsTh643upFfzR/YuJ8YgS66nuiT/6pn8=; b=DyHPNjTdtInZdI57Vie7KezkIuBj6xav86XssJdzSxyg7wXWMYAnIJMfQTFX4NzYZYA8x4AAa5ACj+swGzurkklp0YV8Xg0KNd0PuwB3/xo/DZ9z7s/dcKpD6W6QmDf9fmtgVD88XDjCG3hisKaoyhSEl7OpyLYiHkAGu3BeBrhYshGkJjiNLwv0qXMgN+IJcrQ0sZL5VI5esOSBkjqrEGERyr6Ee595qnhVlBv7mL/DbD5HQZDVaG5OcTMgNS5300guiCTgYv5ip9UxoSEFDo6Hx9lSONPFbNGDfnBLAyGS7/37fzOFp2jOlG5ALOUpNDyBn2jl7jkZDkbavS2weQ== 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=XnCdC7ormYNqsTh643upFfzR/YuJ8YgS66nuiT/6pn8=; b=DvQOl2yd6lj3LITENm48Z0j/CbTCwvOLe8AtwrwsKaKfzd9QXAF0+d5HepH8LN3GErnd5zxVxKODn078Sjzndy72KGa4CdHw/7W9Kq9Zwhdg6oT1rTt8Kq5yIJHn9Xj9eipaavt4EiRauQ0YD5v2yzRLvqPNKa5WNNe8WYs7TMn+z84F7ALTQPG7PEUEjk2eW3cAwXQdlZW+2bGrBJF6IDD4aRUTxrFFoxPNririPXEdMkf448QHxW8WODla+I3eDFvzdJ1RuodMOdyZE9X4RF+n0sNvrXFMz1k/J+ImBKzfnOfR9x+b37fGxng5ZQuxEfotbvX46nwPHJDt3O8MLg== Received: from SA0PR11CA0168.namprd11.prod.outlook.com (2603:10b6:806:1bb::23) by BL1PR12MB5849.namprd12.prod.outlook.com (2603:10b6:208:384::18) 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:36 +0000 Received: from SN1PEPF0002BA4E.namprd03.prod.outlook.com (2603:10b6:806:1bb:cafe::21) by SA0PR11CA0168.outlook.office365.com (2603:10b6:806:1bb::23) 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 SN1PEPF0002BA4E.mail.protection.outlook.com (10.167.242.71) 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:36 +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:17 -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:16 -0800 From: Xueming Li To: Bruce Richardson CC: Sunil Kumar Kori , dpdk stable Subject: patch 'buildtools/cmdline: fix IP address initializer' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:45:43 +0800 Message-ID: <20240305094757.439387-3-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: SN1PEPF0002BA4E:EE_|BL1PR12MB5849:EE_ X-MS-Office365-Filtering-Correlation-Id: 993a1758-101c-47dc-0089-08dc3cf96dc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oAFgx274RBQbeGvspHI+TRJfQFfrYJG3xdQYVTWCwnmq7H1QM+043fEZzCRDwcw9oB0/0OWdJCLOcoscbFOujStagHbclFL03hqC/ZZ00lvSnXppf6E1SpbeXM8aXvqosPriJ2VqbCQZ1HKCWzZ6rdLziLLtB5ofcXMz1RIkB0GV/079HYy6pci/302DjVhYKJJTvArkgweqSlcbhiuREIde9iWbKUS4PpO3PVvMMh4q7wk8SDHB631EclvIIBeRvJ7sb1cwi94Y3qRFCZUeqOQ4LPCjI8jKXRFXGsXF35dMz5c61TmFcBacOAPT1iMvzMMHmhy6/M29eZloT/FCusHTin9rKNpBIyBjPkVCtFvc6fVuABxN8QXxzG0mHb+uwVI5O9O2GwPjILX11aYhjo4EUKbpnjVbfhSxqdSuwhPIawoi4Rw4BTmnyI7rsdoCzh/jHapqI6d/rfJsel2jliQ6yj3sn73WtgmFXM6biCe4adDkg5PPdK/7Ol3eohew6zQ4heGL3+HAyR9cdRZMVhmv05zPSlTTXDIKQnVROYRcTTik9DspjfxHjKFnPjAgWU4+js2XWN09YO/4FS2W6eq5YRY7gqeUO06mkLTuA1ix340q2Ja2+9eSXbEAW6u/z1D2JtreFTUi6rntD3i/etHi5oBuuaILqqAnrOBMiCJH1Ah53vkfiOKmzHDRt19KLpyMkPzlz+Jd4XvOO0dCRR4n3UfwknBlrx82nSE+R0qXhRe1inr9BQjTvg53Wxo8 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:36.4708 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 993a1758-101c-47dc-0089-08dc3cf96dc8 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: SN1PEPF0002BA4E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5849 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=2c512fe65af23d7d217d8bc5c30617962dfab289 Thanks. Xueming Li --- >From 2c512fe65af23d7d217d8bc5c30617962dfab289 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 5 Dec 2023 14:51:08 +0000 Subject: [PATCH] buildtools/cmdline: fix IP address initializer Cc: Xueming Li [ upstream commit 7cd7850a888e5aa112062711107d9417570ca719 ] The IP address type should be generic for both IPv4 and IPv6 and so use the cmdline lib's TOKEN_IPADDR_INITIALIZER rather than TOKEN_IPV4_INITIALIZER. Fixes: 37666691e9ed ("buildtools: add a tool to generate cmdline boilerplate") 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 bf1253d949..30d32ac183 100755 --- a/buildtools/dpdk-cmdline-gen.py +++ b/buildtools/dpdk-cmdline-gen.py @@ -72,7 +72,7 @@ def process_command(lineno, tokens, comment): result_struct.append(f"\tcmdline_ipaddr_t {t_name};") initializers.append( f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n" - f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});" + f"\tTOKEN_IPADDR_INITIALIZER(struct cmd_{name}_result, {t_name});" ) elif t_type.startswith("(") and t_type.endswith(")"): result_struct.append(f"\tcmdline_fixed_string_t {t_name};") -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.174017506 +0800 +++ 0002-buildtools-cmdline-fix-IP-address-initializer.patch 2024-03-05 17:39:30.633566488 +0800 @@ -1 +1 @@ -From 7cd7850a888e5aa112062711107d9417570ca719 Mon Sep 17 00:00:00 2001 +From 2c512fe65af23d7d217d8bc5c30617962dfab289 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7cd7850a888e5aa112062711107d9417570ca719 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org