From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88F9EA04B1 for ; Thu, 5 Nov 2020 13:42:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E8ECC31B; Thu, 5 Nov 2020 13:42:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id DA633C7EE for ; Thu, 5 Nov 2020 13:42:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IzUrCWBg4Z+SzusCd2R3zD9g79uEno662SYLVo9gEJo=; b=a1mLRs05XA08LkHt9OC6OizRHOOguCx+prfK4RrzgwornfM/DeRu8iwYYPh/Nwy7jtUX5R nuBBPJjxOxE+7KtW1Pk9UGxbLgSExThcIdtWkZvNT18gmmdzd6+tSGPsnunayb87WmC4Qc Xfda6d1MRFGQryaWyQ27kIdT+kgWxqE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-517-YkyfI8n9MYyOAJvRVFOILg-1; Thu, 05 Nov 2020 07:42:09 -0500 X-MC-Unique: YkyfI8n9MYyOAJvRVFOILg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 599301074664; Thu, 5 Nov 2020 12:42:08 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4235A5C629; Thu, 5 Nov 2020 12:42:07 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Thomas Monjalon , dpdk stable Date: Thu, 5 Nov 2020 12:40:02 +0000 Message-Id: <20201105124015.306404-55-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' has been queued to LTS release 18.11.11 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/1854fc6fee339fd00078fa4d591c3aefac9f7c7e Thanks. Kevin. --- >From 1854fc6fee339fd00078fa4d591c3aefac9f7c7e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 9 Oct 2020 09:15:54 +0200 Subject: [PATCH] eal: fix doxygen for EAL cleanup [ upstream commit 1a11380bf45be83d66493819f3a6e8c9868869be ] Align rte_eal_cleanup return codes description to the rest of dpdk. Fixes: aec9c13c5257 ("eal: add function to release internal resources") Signed-off-by: David Marchand Acked-by: Thomas Monjalon --- lib/librte_eal/common/include/rte_eal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 595efdca50..94912a8afa 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -185,6 +185,7 @@ int rte_eal_init(int argc, char **argv); * just before terminating the process. * - * @return 0 Successfully released all internal EAL resources - * @return -EFAULT There was an error in releasing all resources. + * @return + * - 0 Successfully released all internal EAL resources. + * - -EFAULT There was an error in releasing all resources. */ int __rte_experimental rte_eal_cleanup(void); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.317970459 +0000 +++ 0055-eal-fix-doxygen-for-EAL-cleanup.patch 2020-11-05 12:38:54.255896031 +0000 @@ -1 +1 @@ -From 1a11380bf45be83d66493819f3a6e8c9868869be Mon Sep 17 00:00:00 2001 +From 1854fc6fee339fd00078fa4d591c3aefac9f7c7e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1a11380bf45be83d66493819f3a6e8c9868869be ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/librte_eal/include/rte_eal.h | 5 +++-- + lib/librte_eal/common/include/rte_eal.h | 5 +++-- @@ -17,5 +18,5 @@ -diff --git a/lib/librte_eal/include/rte_eal.h b/lib/librte_eal/include/rte_eal.h -index ddcf6a2e7a..e3c2ef185e 100644 ---- a/lib/librte_eal/include/rte_eal.h -+++ b/lib/librte_eal/include/rte_eal.h -@@ -131,6 +131,7 @@ int rte_eal_init(int argc, char **argv); +diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h +index 595efdca50..94912a8afa 100644 +--- a/lib/librte_eal/common/include/rte_eal.h ++++ b/lib/librte_eal/common/include/rte_eal.h +@@ -185,6 +185,7 @@ int rte_eal_init(int argc, char **argv); @@ -30 +31 @@ - int rte_eal_cleanup(void); + int __rte_experimental rte_eal_cleanup(void);