From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 68697A05D3 for ; Thu, 25 Apr 2019 17:41:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F0EA1B5C4; Thu, 25 Apr 2019 17:41:57 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 86B3C1B600 for ; Thu, 25 Apr 2019 17:41:55 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAC0CCCB97; Thu, 25 Apr 2019 15:41:54 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E0725D9C6; Thu, 25 Apr 2019 15:41:53 +0000 (UTC) From: Kevin Traynor To: Gage Eads Cc: dpdk stable Date: Thu, 25 Apr 2019 16:40:21 +0100 Message-Id: <20190425154037.28778-46-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 25 Apr 2019 15:41:54 +0000 (UTC) Subject: [dpdk-stable] patch 'ring: fix namesize macro documentation block' has been queued to LTS release 18.11.2 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.2 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/01/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. Queued patches can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 8babdafffcc0af5fac8f92590e5044f55707615c Mon Sep 17 00:00:00 2001 From: Gage Eads Date: Thu, 4 Apr 2019 07:34:54 -0500 Subject: [PATCH] ring: fix namesize macro documentation block [ upstream commit 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 ] '/**<' style comments apply to the previous member, which caused doxygen to emit the RTE_RING_NAMESIZE documentation for RTE_RING_MZ_PREFIX. Fixes: 38c9817ee1d8 ("mempool: adjust name size in related data types") Signed-off-by: Gage Eads --- lib/librte_ring/rte_ring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index af5444a9f..83d0f6f83 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -58,5 +58,5 @@ enum rte_ring_queue_behavior { #define RTE_RING_MZ_PREFIX "RG_" -/**< The maximum length of a ring name. */ +/** The maximum length of a ring name. */ #define RTE_RING_NAMESIZE (RTE_MEMZONE_NAMESIZE - \ sizeof(RTE_RING_MZ_PREFIX) + 1) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:48.733149407 +0100 +++ 0046-ring-fix-namesize-macro-documentation-block.patch 2019-04-25 16:37:46.759294629 +0100 @@ -1 +1 @@ -From 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 Mon Sep 17 00:00:00 2001 +From 8babdafffcc0af5fac8f92590e5044f55707615c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org