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 E0B0DA0A02 for ; Mon, 17 May 2021 18:10:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F0DA410F1; Mon, 17 May 2021 18:10:50 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A17DC40F35 for ; Mon, 17 May 2021 18:10:49 +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 1lifpP-0007VZ-Ha; Mon, 17 May 2021 16:10:47 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Mon, 17 May 2021 18:07:13 +0200 Message-Id: <20210517161039.3132619-4-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 'power: remove duplicated symbols from map file' 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/e7fc0eb5646c2930e28389e8c790bc0d98fbf350 Thanks. Christian Ehrhardt --- >From e7fc0eb5646c2930e28389e8c790bc0d98fbf350 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 25 Feb 2021 10:54:49 +0000 Subject: [PATCH] power: remove duplicated symbols from map file [ upstream commit e79b0efd989a077d0193e7dbf47f966f65d0c9dc ] This is causing build error, like: https://travis-ci.com/github/ovsrobot/dpdk/jobs/482121104 Also '@internal' marker removed from doxygen comment, since public API should not be internal. Experimental tag removed from 'rte_power_guest_channel_send_msg()' Fixes: 4d3892dcd77b ("power: make channel message functions public") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand --- lib/librte_power/rte_power_guest_channel.h | 8 -------- lib/librte_power/rte_power_version.map | 2 -- 2 files changed, 10 deletions(-) diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/librte_power/rte_power_guest_channel.h index ed4fbfdcd3..b5de1bd243 100644 --- a/lib/librte_power/rte_power_guest_channel.h +++ b/lib/librte_power/rte_power_guest_channel.h @@ -119,11 +119,6 @@ struct rte_power_channel_packet_caps_list { }; /** - * @internal - * - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Send a message contained in pkt over the Virtio-Serial to the host endpoint. * * @param pkt @@ -136,13 +131,10 @@ struct rte_power_channel_packet_caps_list { * - 0 on success. * - Negative on error. */ -__rte_experimental int rte_power_guest_channel_send_msg(struct rte_power_channel_packet *pkt, unsigned int lcore_id); /** - * @internal - * * @warning * @b EXPERIMENTAL: this API may change without prior notice. * diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map index 0fe85377ab..e6ef3a7811 100644 --- a/lib/librte_power/rte_power_version.map +++ b/lib/librte_power/rte_power_version.map @@ -35,6 +35,4 @@ EXPERIMENTAL { rte_power_poll_stat_update; # added in 21.02 - rte_power_guest_channel_receive_msg; - rte_power_guest_channel_send_msg; }; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:29.758295654 +0200 +++ 0004-power-remove-duplicated-symbols-from-map-file.patch 2021-05-17 17:40:29.091808846 +0200 @@ -1 +1 @@ -From e79b0efd989a077d0193e7dbf47f966f65d0c9dc Mon Sep 17 00:00:00 2001 +From e7fc0eb5646c2930e28389e8c790bc0d98fbf350 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e79b0efd989a077d0193e7dbf47f966f65d0c9dc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - lib/librte_power/version.map | 2 -- + lib/librte_power/rte_power_version.map | 2 -- @@ -53,5 +54,7 @@ -diff --git a/lib/librte_power/version.map b/lib/librte_power/version.map -index 3ba9390241..b004e3e4a9 100644 ---- a/lib/librte_power/version.map -+++ b/lib/librte_power/version.map -@@ -38,6 +38,4 @@ EXPERIMENTAL { +diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map +index 0fe85377ab..e6ef3a7811 100644 +--- a/lib/librte_power/rte_power_version.map ++++ b/lib/librte_power/rte_power_version.map +@@ -35,6 +35,4 @@ EXPERIMENTAL { + rte_power_poll_stat_update; + @@ -59,2 +61,0 @@ - rte_power_ethdev_pmgmt_queue_disable; - rte_power_ethdev_pmgmt_queue_enable;