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 6774DA046B for ; Tue, 23 Jul 2019 03:03:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 55DF41BFBA; Tue, 23 Jul 2019 03:03:20 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 8F2F01BFAC for ; Tue, 23 Jul 2019 03:03:19 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:16 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hfq026580; Tue, 23 Jul 2019 04:03:15 +0300 From: Yongseok Koh To: Gage Eads Cc: dpdk stable Date: Mon, 22 Jul 2019 18:00:33 -0700 Message-Id: <20190723010115.6446-66-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ring: fix namesize macro documentation block' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From 33d410a26b7f4c1f5fe5dc40a8096632a0e3b081 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 978c4dd173..935bfac6c5 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -112,7 +112,7 @@ 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.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:10.026681484 -0700 +++ 0066-ring-fix-namesize-macro-documentation-block.patch 2019-07-22 17:55:06.208474000 -0700 @@ -1,13 +1,14 @@ -From 97c48e71fc030a2ff9ab55e4462a4d22f93e37b6 Mon Sep 17 00:00:00 2001 +From 33d410a26b7f4c1f5fe5dc40a8096632a0e3b081 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") -Cc: stable@dpdk.org Signed-off-by: Gage Eads --- @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h -index af5444a9f3..83d0f6f836 100644 +index 978c4dd173..935bfac6c5 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h -@@ -57,7 +57,7 @@ enum rte_ring_queue_behavior { +@@ -112,7 +112,7 @@ enum rte_ring_queue_behavior { }; #define RTE_RING_MZ_PREFIX "RG_"