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 94248A0A02 for ; Mon, 17 May 2021 18:13:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D266410F7; Mon, 17 May 2021 18:13:45 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D258040041 for ; Mon, 17 May 2021 18:13:43 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsD-0007yH-JI; Mon, 17 May 2021 16:13:41 +0000 From: Christian Ehrhardt To: David Marchand Cc: Harry van Haaren , Thomas Monjalon , dpdk stable Date: Mon, 17 May 2021 18:08:29 +0200 Message-Id: <20210517161039.3132619-80-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'service: clean references to removed symbol' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/2875a8341a35cbf0439597f954036c4d7d7871e9 Thanks. Christian Ehrhardt --- >From 2875a8341a35cbf0439597f954036c4d7d7871e9 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 7 Apr 2021 11:06:56 +0200 Subject: [PATCH] service: clean references to removed symbol [ upstream commit 60e0e75b615fc94b8538a5334dffc0935864438c ] rte_service_get_id() was removed in v17.11 but the API description still referenced it and a version node was still present in EAL map. Fixes: 8edc9aaaf217 ("service: use id in get by name function") Signed-off-by: David Marchand Reviewed-by: Harry van Haaren Acked-by: Thomas Monjalon --- lib/librte_eal/common/include/rte_service.h | 5 +---- lib/librte_eal/rte_eal_version.map | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h index e2d0a6dd32..b91d738de9 100644 --- a/lib/librte_eal/common/include/rte_service.h +++ b/lib/librte_eal/common/include/rte_service.h @@ -47,10 +47,7 @@ extern "C" { #define RTE_SERVICE_CAP_MT_SAFE (1 << 0) /** - * Return the number of services registered. - * - * The number of services registered can be passed to *rte_service_get_by_id*, - * enabling the application to retrieve the specification of each service. + * Return the number of services registered. * * @return The number of services registered. */ diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index e38d02530c..9ff3f76a87 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -159,7 +159,6 @@ DPDK_20.0 { rte_service_component_unregister; rte_service_dump; rte_service_finalize; - rte_service_get_by_id; rte_service_get_by_name; rte_service_get_count; rte_service_get_name; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.631258702 +0200 +++ 0080-service-clean-references-to-removed-symbol.patch 2021-05-17 17:40:29.247810073 +0200 @@ -1 +1 @@ -From 60e0e75b615fc94b8538a5334dffc0935864438c Mon Sep 17 00:00:00 2001 +From 2875a8341a35cbf0439597f954036c4d7d7871e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60e0e75b615fc94b8538a5334dffc0935864438c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,2 @@ - lib/librte_eal/include/rte_service.h | 5 +---- - lib/librte_eal/version.map | 1 - + lib/librte_eal/common/include/rte_service.h | 5 +---- + lib/librte_eal/rte_eal_version.map | 1 - @@ -20,4 +21,4 @@ -diff --git a/lib/librte_eal/include/rte_service.h b/lib/librte_eal/include/rte_service.h -index ca9950d091..c7d037d862 100644 ---- a/lib/librte_eal/include/rte_service.h -+++ b/lib/librte_eal/include/rte_service.h +diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h +index e2d0a6dd32..b91d738de9 100644 +--- a/lib/librte_eal/common/include/rte_service.h ++++ b/lib/librte_eal/common/include/rte_service.h @@ -36,5 +37,5 @@ -diff --git a/lib/librte_eal/version.map b/lib/librte_eal/version.map -index fc305c1c71..7a307e3cc9 100644 ---- a/lib/librte_eal/version.map -+++ b/lib/librte_eal/version.map -@@ -159,7 +159,6 @@ DPDK_21 { +diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map +index e38d02530c..9ff3f76a87 100644 +--- a/lib/librte_eal/rte_eal_version.map ++++ b/lib/librte_eal/rte_eal_version.map +@@ -159,7 +159,6 @@ DPDK_20.0 {