[dpdk-stable] patch 'ring: fix namesize macro documentation block' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:00:33 CEST 2019


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 <gage.eads at intel.com>
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 <gage.eads at intel.com>
---
 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 <gage.eads at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Gage Eads <gage.eads at intel.com>
 ---
@@ -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_"


More information about the stable mailing list