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 965BA41D8D for ; Mon, 27 Feb 2023 08:05:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 923C84114B; Mon, 27 Feb 2023 08:05:03 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2072.outbound.protection.outlook.com [40.107.93.72]) by mails.dpdk.org (Postfix) with ESMTP id F3F2D40A84 for ; Mon, 27 Feb 2023 08:05:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GmIFvN3ki5AoCzo7O5521Ia3L1rD3wZNJrODuNBQWFdcJKfLR9eI0T/HOzHS/Gs9dbJWWShK3Dt/K0qXkgnwFMcALbS/GmkPfeAK3HS5Yt3IvCZGN+24tMyRB+QUnCNWW8A0l+DctTTf5TX1NTSEykqHQnnhEDfiMIrElIpu1OH7lw3RE/QZUrPhsk0l0amSVz0MiHXJycYTEYxfxqcl09TG4RWcT85Cy64rFKVkG+97zwVYbPo46eINQK1eYQiNTH07VaaLj/RuPelbuIASPtVP5SbUIdnKpgEVwgcaj0kYaztiSAivktUJqQGeGs4RC86QyDWFEx+YAYXxEPlYfw== 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=1ne85WJhTfWkxNlr3yLaA/nxC5ExvjSMZp0ocahbOm0=; b=SI62agI8EqfRoxeKLnfYCbAn2WtHdGiohR/zGQzo2rBHTK2uJsfWXx+JBSLY+4AKXk0l4fPQBUtKPmorWvvnRAGVGzHLmx+9O0pPG1mWWe8/M/tLtDZtwhNTcZZF1EJM/I9hvaT6rl5EUI0sMHf/OkSWfNSyLgfNJyeAPlh6aBMqZtp5IP7Sue23YJANYUEGqh0lTjbGEd8E5HFg1YqMef7sD3c866w0H3HztliAuXZpFeX8nPkpLd0kiSbCcvpiSw1pquNS2ljkyNLfzAOdtCVNRpNWktL/jsjWm7M/DUkFD9LY1131/D306P5Ur3PvrFiWgOjHGyf9k1qkJHDNvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.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 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=1ne85WJhTfWkxNlr3yLaA/nxC5ExvjSMZp0ocahbOm0=; b=QkqgDfFyW+kxnDSZWqkSjd41AvT//5CzxbNHkv0Swyn/4Ru+PGWJb78M269qYzNiEAze9i1ZUuM+d17n4pQGsNsTFPrAW4tPaIKzapqs7HKaMZSpNOePxNkPBRKTf1sUGdOOW2myByRlRF9USVCRBfuwzgQH7z/16mpB3GJsM+cV8pUdwHelCGZ4cPD0EFe9Z2JcgaS2KnIhd1p62FSGU9fChh34hcY8TvojItXmVaCYlCa4reaMO6qrczi/kkcz2B16lc0Ac3pwVvn6VaJsLXtdh1EM2JWXqLwinjgDF9Qc6AKL8kpQOXOkSr84fLmrInuZWP72zVZEiSAfL/nhxg== Received: from BN1PR12CA0003.namprd12.prod.outlook.com (2603:10b6:408:e1::8) by DM4PR12MB5890.namprd12.prod.outlook.com (2603:10b6:8:66::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:04:59 +0000 Received: from BL02EPF000108EA.namprd05.prod.outlook.com (2603:10b6:408:e1:cafe::30) by BN1PR12CA0003.outlook.office365.com (2603:10b6:408:e1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:04:59 +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 BL02EPF000108EA.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:04:59 +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.36; Sun, 26 Feb 2023 23:04:42 -0800 Received: from nvidia.com (10.126.231.37) 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.986.37; Sun, 26 Feb 2023 23:04:39 -0800 From: Xueming Li To: Huisong Li CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Chengwen Feng , Bruce Richardson , dpdk stable Subject: patch 'telemetry: move include after guard' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:00 +0800 Message-ID: <20230227070107.15664-32-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] 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: BL02EPF000108EA:EE_|DM4PR12MB5890:EE_ X-MS-Office365-Filtering-Correlation-Id: 4503311e-6791-479c-ddc2-08db1890f090 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MsG6hklzT31I1+i4a+opC3bqFVEBlLpzeWWOh8U1Y58tjzx+SjDoQtJS31hhqpaJTcbmdE5c2WvA2FsIUckJ2qYMNLijpq94Ziw4HHp2LXwENwvPp+JTDQMcZeMOwNlwo6uEUjHReRis4CAvQz82KIVhKf0MQKCF8Z3XrGkwEXHIjpo8CrNNB3PssX4lLqbg1QyOWDHFO8WPZ4r3KTFFK8PsSci583DKjOe89QxKAMsLaNTlT2MmZnw2KJjPV1jyCcR5AzWEZ690GRsOd7+iMrUOJriw0m3Hib4q6mlRE7V6unldAgiSMBKISDnBFuhXkyZ618uYYWVqWdvFAAQqvW9LclFLCL3EnmtprRG0aYGLw0LFxUkdj5c8FLFmr+FPEAdiyNWKmIADrpq9U4/mX3LQI1UwrTjoMggA4c6oNKNAe683gPkq7LGrdKMDlzCZM4y2mA9oO4gRkgEGGqvrSzfpjrz/WwnxI2Kk+x8BSxhw5GN2g5MQGMZlw61y75zNA4bDtybuDpkCUXdrMTp4oiOOL7dZc4Atl/hbT/wRzm1ABmNdyH3ACGphy4zJyzw2wtcx9B1Gi1GqAe0ULNIvJNwfIJTlwifQ8dEn+9CokA/Vo5LHo2IQf/6LmYfHsE2J2yDFutU5CW+M+2YsJEjY03wq+GJRyLaO8YThb20oARjxXQP9/xWvjnd6MTbrtM6MvlKUgvRZVSb8EyQup1LYZ4e4jkDD6f8i61UlJYOR9bwweoxSScLj64hmYmWwx2/VWdHDq2BRMwDEHqvJE0Ng8eWXVidGb83xKsXBwplEjgc= 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:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(40470700004)(46966006)(36840700001)(40460700003)(16526019)(186003)(6286002)(82740400003)(7636003)(356005)(83380400001)(6916009)(8936002)(70586007)(4326008)(8676002)(41300700001)(5660300002)(2906002)(70206006)(36860700001)(1076003)(40480700001)(336012)(26005)(7696005)(55016003)(47076005)(478600001)(2616005)(53546011)(6666004)(426003)(66574015)(36756003)(82310400005)(86362001)(54906003)(316002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:04:59.1252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4503311e-6791-479c-ddc2-08db1890f090 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: BL02EPF000108EA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5890 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.2 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/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4f9c6db77bad1c99bc921eddeeceb8092f0d796b Thanks. Xueming Li --- >From 4f9c6db77bad1c99bc921eddeeceb8092f0d796b Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 19 Dec 2022 15:06:41 +0800 Subject: [PATCH] telemetry: move include after guard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit f7b74387be1de6803716262d7988794accd6d39f ] The "stdint.h" header is outside '_RTE_TELEMETRY_H_' macro, which cause this header is unconditional. So this patch moves this header to inside '_RTE_TELEMETRY_H_'. Fixes: 99a2dd955fba ("lib: remove librte_ prefix from directory names") Signed-off-by: Huisong Li Acked-by: Morten Brørup Acked-by: Chengwen Feng Acked-by: Bruce Richardson --- lib/telemetry/rte_telemetry.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h index d9918c4e96..40e9a3bf9d 100644 --- a/lib/telemetry/rte_telemetry.h +++ b/lib/telemetry/rte_telemetry.h @@ -2,9 +2,6 @@ * Copyright(c) 2018 Intel Corporation */ -#include - - #ifndef _RTE_TELEMETRY_H_ #define _RTE_TELEMETRY_H_ @@ -12,6 +9,8 @@ extern "C" { #endif +#include + /** Maximum length for string used in object. */ #define RTE_TEL_MAX_STRING_LEN 128 /** Maximum length of string. */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.988096700 +0800 +++ 0033-telemetry-move-include-after-guard.patch 2023-02-27 14:08:40.749237000 +0800 @@ -1 +1 @@ -From f7b74387be1de6803716262d7988794accd6d39f Mon Sep 17 00:00:00 2001 +From 4f9c6db77bad1c99bc921eddeeceb8092f0d796b Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit f7b74387be1de6803716262d7988794accd6d39f ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org