From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C8E60A0524
for <public@inbox.dpdk.org>; Fri, 5 Feb 2021 12:35:14 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C3886188A24;
Fri, 5 Feb 2021 12:35:14 +0100 (CET)
Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com
[209.85.221.48])
by mails.dpdk.org (Postfix) with ESMTP id C38B4188A28
for <stable@dpdk.org>; Fri, 5 Feb 2021 12:35:13 +0100 (CET)
Received: by mail-wr1-f48.google.com with SMTP id c4so7274730wru.9
for <stable@dpdk.org>; Fri, 05 Feb 2021 03:35:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=wPhEVclCiBpJsbNqG7JwKA5haEEoDqQ5gNiPZHN18ko=;
b=NrGkHptcr1nwSql8d8l+4B9IL8JkrgJP+A5QmLxkScaTgm/+x5NLjn+giNmJWRQF91
ywYfL27VQ+C7INpjt76q3pX6fKelPGQao0VwkRCOb+E5ZKvNKYKWGnLe8yoGfJPSsUaO
knslfQgQ+2gIo63280lvegWxhLu7H8EXDcECnWJNx+0pviY7zosKbhyzrlrpXYEmsd74
GoUM4nwxLhN728/wRK/SBi7kMs70pqV360LcR5kXMxkcqtoQCEQvdBCNPs8UTIQmbhs7
PGEqUlqqRbfY3yugBj5QexjAjMwikXW7J6LL4O2xtXYAkONSrZiHkIMEQmjbA6EmhlKr
2nlQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=wPhEVclCiBpJsbNqG7JwKA5haEEoDqQ5gNiPZHN18ko=;
b=GlfOToTX6P5ZA3k3Z1UCe2XXe/8GPAWlNFDjAr6vvZ5FvKvbV82FaQcf6PwzKC5qma
n9HrKBLFnjTyNzraAu5nr8QE03petJ2fVp3TJUtl1yu55K+A0F7KNpVMgLhEnFAa8WD/
dNENzOMAxURc3b1a6rjOPcAa5rECknfF5xFzBeglB3E6P+pVNLfQkCskjlp9oNF6RMoL
7Ou43J+G/dSUW7cGBLAzRMZCpgPho32hNg394LrZNYtjO8goldJP4LgYBJcD83rK3W9H
7lBkp1KiIRixhNhbCDbhfzFi+zm3AwoPzXZLqoXVDM4zUaBBzywC9mvnjZVvtbkgGQmY
Uk3Q==
X-Gm-Message-State: AOAM531XzIczs7TvsE6VhHivKHINL2caTuC4I5nzxaNMDM5FvGvEh340
W3HUQvbrwK69R6jAiKwAYSd0OOVl8SZOGV/H
X-Google-Smtp-Source: ABdhPJyudDsqhgEWgeQXccOclBhvYc5r58OwIYb5RXAM23u7qs+gO0S18cb5/9dU1YsJA1O+6kJZQA==
X-Received: by 2002:a5d:6041:: with SMTP id j1mr4499861wrt.155.1612524913618;
Fri, 05 Feb 2021 03:35:13 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id i15sm7832848wmq.26.2021.02.05.03.35.12
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 05 Feb 2021 03:35:12 -0800 (PST)
From: luca.boccassi@gmail.com
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: David Marchand <david.marchand@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Fri, 5 Feb 2021 11:17:56 +0000
Message-Id: <20210205111920.1272063-190-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com>
References: <20210205111920.1272063-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'metrics: fix variable declaration in header'
has been queued to stable release 20.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.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 02/07/21. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/6946b6cff01bbdb17fd799d3b25610ccd5cf09a4
Thanks.
Luca Boccassi
---
>From 6946b6cff01bbdb17fd799d3b25610ccd5cf09a4 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 15 Jan 2021 11:10:45 +0000
Subject: [PATCH] metrics: fix variable declaration in header
[ upstream commit 701283309404e394693fba46ed71834593af808e ]
The global variable "tel_met_data" was declared in a header file, rather
than in a C file, leading to duplicate definitions if more than one C
file included the header.
Fixes: c5b7197f662e ("telemetry: move some functions to metrics library")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
lib/librte_metrics/rte_metrics_telemetry.c | 2 ++
lib/librte_metrics/rte_metrics_telemetry.h | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c
index 901cbeb0a3..b8ee56ef01 100644
--- a/lib/librte_metrics/rte_metrics_telemetry.c
+++ b/lib/librte_metrics/rte_metrics_telemetry.c
@@ -13,6 +13,8 @@
#include "rte_metrics.h"
#include "rte_metrics_telemetry.h"
+struct telemetry_metrics_data tel_met_data;
+
int metrics_log_level;
/* Logging Macros */
diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h
index 3435a55425..5dbb32ca0c 100644
--- a/lib/librte_metrics/rte_metrics_telemetry.h
+++ b/lib/librte_metrics/rte_metrics_telemetry.h
@@ -34,8 +34,6 @@ struct telemetry_metrics_data {
int metrics_register_done;
};
-struct telemetry_metrics_data tel_met_data;
-
__rte_experimental
int32_t rte_metrics_tel_reg_all_ethdev(int *metrics_register_done,
int *reg_index_list);
--
2.29.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-02-05 11:18:37.682600593 +0000
+++ 0190-metrics-fix-variable-declaration-in-header.patch 2021-02-05 11:18:29.142697509 +0000
@@ -1 +1 @@
-From 701283309404e394693fba46ed71834593af808e Mon Sep 17 00:00:00 2001
+From 6946b6cff01bbdb17fd799d3b25610ccd5cf09a4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 701283309404e394693fba46ed71834593af808e ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org