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 735BF41D52 for ; Thu, 23 Feb 2023 16:07:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E58243249; Thu, 23 Feb 2023 16:07:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C14544323D for ; Thu, 23 Feb 2023 16:07:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wndkIFcIZh5vv7UIttLcuRU9Blr/OANIUfg9OzTED10=; b=WM60+/ufbpDIx3UCVZLECV5DiSfe+yCVbn8P/n/YhWAK40X3bdLdm6NCz6ylDE7pp0uN2T qlAfpksAZc2UqSqphx7fPQQpQHigZWTm/LkUCyu6p70QLxELgjfANaX0KxHsJDCiHDdxPT DW9hySgLhSSAPXFIZ+zzCA7GJsptNPo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-512-WWi33TydO7WscnOvtvBaTQ-1; Thu, 23 Feb 2023 10:07:22 -0500 X-MC-Unique: WWi33TydO7WscnOvtvBaTQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DFDC3811F52; Thu, 23 Feb 2023 15:07:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D1F32166B29; Thu, 23 Feb 2023 15:07:08 +0000 (UTC) From: Kevin Traynor 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 21.11.4 Date: Thu, 23 Feb 2023 15:05:07 +0000 Message-Id: <20230223150631.723699-16-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/005b23b18fba1259847ace67251edd09367e3a69 Thanks. Kevin --- >From 005b23b18fba1259847ace67251edd09367e3a69 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 [ 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h index 3372b32f38..0f24579235 100644 --- a/lib/telemetry/rte_telemetry.h +++ b/lib/telemetry/rte_telemetry.h @@ -3,8 +3,4 @@ */ -#include - -#include - #ifndef _RTE_TELEMETRY_H_ #define _RTE_TELEMETRY_H_ @@ -14,4 +10,8 @@ extern "C" { #endif +#include + +#include + /** Maximum length for string used in object. */ #define RTE_TEL_MAX_STRING_LEN 128 -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.241707489 +0000 +++ 0016-telemetry-move-include-after-guard.patch 2023-02-23 14:46:23.719235788 +0000 @@ -1 +1 @@ -From f7b74387be1de6803716262d7988794accd6d39f Mon Sep 17 00:00:00 2001 +From 005b23b18fba1259847ace67251edd09367e3a69 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f7b74387be1de6803716262d7988794accd6d39f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -21,2 +22,2 @@ - lib/telemetry/rte_telemetry.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + lib/telemetry/rte_telemetry.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -25 +26 @@ -index d9918c4e96..40e9a3bf9d 100644 +index 3372b32f38..0f24579235 100644 @@ -28 +29 @@ -@@ -3,7 +3,4 @@ +@@ -3,8 +3,4 @@ @@ -32,0 +34 @@ +-#include @@ -36 +38 @@ -@@ -13,4 +10,6 @@ extern "C" { +@@ -14,4 +10,8 @@ extern "C" { @@ -39,0 +42,2 @@ ++ ++#include