From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 12BBF1B49F for ; Fri, 4 Jan 2019 14:26:34 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63F45C0524E1; Fri, 4 Jan 2019 13:26:33 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id C31C35C228; Fri, 4 Jan 2019 13:26:31 +0000 (UTC) From: Kevin Traynor To: Erik Gabriel Carrillo Cc: Jerin Jacob , dpdk stable Date: Fri, 4 Jan 2019 13:23:54 +0000 Message-Id: <20190104132455.15170-12-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 04 Jan 2019 13:26:33 +0000 (UTC) Subject: [dpdk-stable] patch 'eventdev: remove redundant timer adapter function prototypes' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:26:34 -0000 Hi, FYI, your patch has been queued to LTS release 18.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 01/11/19. 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. Thanks. Kevin Traynor --- >>From 832f227f6d4cc00d39fd1e8189b49e7352e5d43a Mon Sep 17 00:00:00 2001 From: Erik Gabriel Carrillo Date: Thu, 29 Nov 2018 13:45:26 -0600 Subject: [PATCH] eventdev: remove redundant timer adapter function prototypes [ upstream commit ac0fc54a49eb4c07ed38606344683dd533a4decb ] Fixes: 6750b21bd6af ("eventdev: add default software timer adapter") Signed-off-by: Erik Gabriel Carrillo Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_event_timer_adapter.h | 57 +------------------ 1 file changed, 2 insertions(+), 55 deletions(-) diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/librte_eventdev/rte_event_timer_adapter.h index d4ea6f172..db98dec46 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.h +++ b/lib/librte_eventdev/rte_event_timer_adapter.h @@ -462,59 +462,6 @@ rte_event_timer_adapter_stats_get(struct rte_event_timer_adapter *adapter, * - <0: Failure; error code returned. */ -int __rte_experimental rte_event_timer_adapter_stats_reset( - struct rte_event_timer_adapter *adapter); - -/** - * Retrieve the service ID of the event timer adapter. If the adapter doesn't - * use an rte_service function, this function returns -ESRCH. - * - * @param adapter - * A pointer to an event timer adapter. - * - * @param [out] service_id - * A pointer to a uint32_t, to be filled in with the service id. - * - * @return - * - 0: Success - * - <0: Error code on failure, if the event dev doesn't use a rte_service - * function, this function returns -ESRCH. - */ -int -rte_event_timer_adapter_service_id_get(struct rte_event_timer_adapter *adapter, - uint32_t *service_id); - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Retrieve statistics for an event timer adapter instance. - * - * @param adapter - * A pointer to an event timer adapter structure. - * @param[out] stats - * A pointer to a structure to fill with statistics. - * - * @return - * - 0: Successfully retrieved. - * - <0: Failure; error code returned. - */ -int rte_event_timer_adapter_stats_get(struct rte_event_timer_adapter *adapter, - struct rte_event_timer_adapter_stats *stats); - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Reset statistics for an event timer adapter instance. - * - * @param adapter - * A pointer to an event timer adapter structure. - * - * @return - * - 0: Successfully reset; - * - <0: Failure; error code returned. - */ -int rte_event_timer_adapter_stats_reset( - struct rte_event_timer_adapter *adapter); +int __rte_experimental +rte_event_timer_adapter_stats_reset(struct rte_event_timer_adapter *adapter); /** -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:07.745762834 +0000 +++ 0012-eventdev-remove-redundant-timer-adapter-function-pro.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,10 +1,11 @@ -From ac0fc54a49eb4c07ed38606344683dd533a4decb Mon Sep 17 00:00:00 2001 +From 832f227f6d4cc00d39fd1e8189b49e7352e5d43a Mon Sep 17 00:00:00 2001 From: Erik Gabriel Carrillo Date: Thu, 29 Nov 2018 13:45:26 -0600 Subject: [PATCH] eventdev: remove redundant timer adapter function prototypes +[ upstream commit ac0fc54a49eb4c07ed38606344683dd533a4decb ] + Fixes: 6750b21bd6af ("eventdev: add default software timer adapter") -Cc: stable@dpdk.org Signed-off-by: Erik Gabriel Carrillo Acked-by: Jerin Jacob