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 15FA243E57 for ; Sat, 13 Apr 2024 14:56:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 106ED40DD8; Sat, 13 Apr 2024 14:56:07 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2044.outbound.protection.outlook.com [40.107.102.44]) by mails.dpdk.org (Postfix) with ESMTP id E783A40DF5 for ; Sat, 13 Apr 2024 14:56:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FpdWx+QFpHHjz1FK1gEh5gP4lz+twGqOZ2iPYmPQXihnICJdmPK1Uk1cgOCos37NXGblKmRwUGBTSA2stRM6rORZ4fcNE0WijVofOajB89au7VI2NStbl4SNVjPabHfyhV6nxzJci6jgLIRzXyByUznMNm6NHcRgGmaeMH/ZTsLGOWeizRKDjB6xvhYqTr4l3bugQDnp66RtJHEOvyfyIbzEHnOmZECjUAU7i2IMe2hIpHSEM2QbQSkEnJe/l16Rurl+KYeeS5Y5c7ccBq31ASvrMRDLHDTHH5VmoJvqnhXu2+8K3LZ1lYN4TUtAWgprluF+lLTJjchlk6oGB9vuqQ== 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=E2PCe1yhzK3T3zCt7j3TlcYidP2r8RMFnkl+Pv96USk=; b=LdxlW4qyZ+5hgaTdEkjoaEbBCQopMSOoGUOTUhFi5BcFdkw1NpzNncG5ocpM6UGkaiOHEiEcCx6TsyKChvIc757UXcMmuA9Ekbx7U/hXWzc5hZK/6MkIzF8B0VlykmJBJoky+JPzK+976xefllNosOcABebK1xBnXCaQLdj5qf/dlMelWe/rv5xeaBYkHMo/duJn3JzYwGCMJ9wWygDHKAGRRWkXgl9aJ7AKsec9KFIEE+ukQpDor2Y3AAue3SADhyqn8yQPGy9/7OoQ6wSHf4+86lY6r2db/ZJawbadlbJk7+nVT9wo4xELfs58rNcvmOZ2+/+19dsiDK/b9HbwTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=arm.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=E2PCe1yhzK3T3zCt7j3TlcYidP2r8RMFnkl+Pv96USk=; b=GSQrvHp+xDSouXB6l6gd4up7qhwLhC+BrTM90nKnhvAG4EdMWx40AhpEt+5O+mZjMQoZSJPci7kD3u0UDVS3G1bVDQ0/KDquURQO/TfDPUi9awZ/f9IXBVDElhFSUerAJ0TXRFAx3uPYlU+BITDX28PbuPOm7T5NJ5ZlqyFvKym3VmtBWPc3M/F0Kt2z/rFfXUbq12Qwra7XF9XVDJlNb6KnD4eBeD84j8ZI5S00OoJG4jhKiqic4ppeSpdFW5rAEHh5UfiBC0Cg6euoXQhtTwakV9p5Oygb4gXN10j/O9R08MsFyS1bJuMR6a23aPkL5wAhZ7lqNVJ4XmqPYw2X8A== Received: from DM6PR10CA0035.namprd10.prod.outlook.com (2603:10b6:5:60::48) by DS7PR12MB6007.namprd12.prod.outlook.com (2603:10b6:8:7e::13) 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 12:56:03 +0000 Received: from DS3PEPF0000C37F.namprd04.prod.outlook.com (2603:10b6:5:60:cafe::6a) by DM6PR10CA0035.outlook.office365.com (2603:10b6:5:60::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.30 via Frontend Transport; Sat, 13 Apr 2024 12:56:03 +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 DS3PEPF0000C37F.mail.protection.outlook.com (10.167.23.9) 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 12:56:03 +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; Sat, 13 Apr 2024 05:55:53 -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 05:55:51 -0700 From: Xueming Li To: Joyce Kong CC: Ruifeng Wang , Stephen Hemminger , Pavan Nikhilesh , dpdk stable Subject: patch 'config: fix CPU instruction set for cross-build' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:05 +0800 Message-ID: <20240413125005.725659-65-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: DS3PEPF0000C37F:EE_|DS7PR12MB6007:EE_ X-MS-Office365-Filtering-Correlation-Id: f48bfe35-1e16-4dd6-1a78-08dc5bb91393 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /0p6sOAs54F/KGmYqhOf/vSLmYqwLtHBWj16vyTgVOqqvVGZN1rxcTwhKZsNMejmTprPZRta/z7p4ABy3ChltQoFsuKWDDrNJ5rwnhy2C8YieHrBH7B/J79VbBKlyVzBeBmp04v0JQs8E6r9zp8tA51SskrvpjNaLu6LZg85l6ipTeWPxYhQAgNrXJTyP+58EvJZ33ntd9AWpD+jA7unT5LwAGkQrQRA2vJLWfx2x3MIgPjSOVPSu8kItpp7Hl1M9twOJAt/oSIZpPvMlGhcfJleRz/03rr0dybVOcKVXiOklY5F6gvxmeOQumgmrst2CXHJS8s2wxB9zG2de0ahNB28KiTO1hpj3g9A/vTlZrWVnl8kze+g5wri2NtMPboK76OdHzS5kAhZlAiRW+HRaERpvNxyG6mmzH+jR493nKJW4p4V3OWSaCHfEDHIjKQQbgdyS81C8O9iNWjOG/gkMxNyvrGBfpCUUD2gapOgzLhLX7P93ytLuC4jGkXVjv9ZyQFynlCEcCmneFh+vz/ZrH0B6ZSciPhj533jXgWtQYx9C6hcEpX1bXXzwy1VwVweFEm8a1HewPEcjHw5DLh0HUW/AwH37OikaP6FbOQJ2YKdLjiIGRbRncJLDOKmE8bchizXWn25ZLuhvCiXKi5x7bb2BJ3vVwIiRNrRaLaKC01qfd64ynqfmAQnxQYeNHUe/sm7ycoUEt3Ug9E6GvLnx5wgo76PeWmJ9hMulrbjBj1LpttxsQkTJJ8il5zR/zzS 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)(36860700004)(1800799015)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:56:03.3846 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f48bfe35-1e16-4dd6-1a78-08dc5bb91393 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: DS3PEPF0000C37F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6007 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=ced51dd5efede54fd04d0b1f7b4da3c5785df7bf Thanks. Xueming Li --- >From ced51dd5efede54fd04d0b1f7b4da3c5785df7bf Mon Sep 17 00:00:00 2001 From: Joyce Kong Date: Tue, 5 Dec 2023 03:52:58 +0000 Subject: [PATCH] config: fix CPU instruction set for cross-build Cc: Xueming Li [ upstream commit d74543f8ad30db164c08ec69910b05d6811b1b89 ] The platform value would be 'native' only when not cross build. Move the operation about modifying cpu_instruction_set while platform equals 'native' to the not cross build branch. Fixes: bf66003b51ec ("build: use platform for generic and native builds") Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang Acked-by: Stephen Hemminger Tested-by: Pavan Nikhilesh --- config/meson.build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index 65662c5de3..898b719929 100644 --- a/config/meson.build +++ b/config/meson.build @@ -121,13 +121,14 @@ else cpu_instruction_set = 'generic' endif endif + if platform == 'native' + if cpu_instruction_set == 'auto' + cpu_instruction_set = 'native' + endif + endif endif -if platform == 'native' - if cpu_instruction_set == 'auto' - cpu_instruction_set = 'native' - endif -elif platform == 'generic' +if platform == 'generic' if cpu_instruction_set == 'auto' cpu_instruction_set = 'generic' endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.050449350 +0800 +++ 0065-config-fix-CPU-instruction-set-for-cross-build.patch 2024-04-13 20:43:05.017753905 +0800 @@ -1 +1 @@ -From d74543f8ad30db164c08ec69910b05d6811b1b89 Mon Sep 17 00:00:00 2001 +From ced51dd5efede54fd04d0b1f7b4da3c5785df7bf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d74543f8ad30db164c08ec69910b05d6811b1b89 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 8cb6429313..bbb931a457 100644 +index 65662c5de3..898b719929 100644 @@ -25 +27 @@ -@@ -128,13 +128,14 @@ else +@@ -121,13 +121,14 @@ else