patch 'telemetry: move include after guard' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:05:07 CET 2023


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 <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

[ 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 | 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 <stdint.h>
-
-#include <rte_compat.h>
-
 #ifndef _RTE_TELEMETRY_H_
 #define _RTE_TELEMETRY_H_
@@ -14,4 +10,8 @@ extern "C" {
 #endif
 
+#include <stdint.h>
+
+#include <rte_compat.h>
+
 /** 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 at 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 <rte_compat.h>
@@ -36 +38 @@
-@@ -13,4 +10,6 @@ extern "C" {
+@@ -14,4 +10,8 @@ extern "C" {
@@ -39,0 +42,2 @@
++
++#include <rte_compat.h>



More information about the stable mailing list