patch 'telemetry: move include after guard' has been queued to stable release 22.11.2
Xueming Li
xuemingl at nvidia.com
Mon Feb 27 07:59:00 CET 2023
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 <xuemingl at nvidia.com>
---
>From 4f9c6db77bad1c99bc921eddeeceb8092f0d796b Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
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 <xuemingl at nvidia.com>
[ 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 <lihuisong at huawei.com>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
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 <stdint.h>
-
-
#ifndef _RTE_TELEMETRY_H_
#define _RTE_TELEMETRY_H_
@@ -12,6 +9,8 @@
extern "C" {
#endif
+#include <stdint.h>
+
/** 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 <xuemingl at nvidia.com>
+
+[ upstream commit f7b74387be1de6803716262d7988794accd6d39f ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list