patch 'ring: remove leftover comment about watermark' has been queued to stable release 19.11.14

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/22. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/325a874c84f6962ad534a6882539a021880b6350

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 325a874c84f6962ad534a6882539a021880b6350 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 31 May 2022 10:20:41 -0700
Subject: [PATCH] ring: remove leftover comment about watermark

[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ]

The watermark support was removed from rte_ring since version
17.02 but there is leftover in comments.

Fixes: 77dd3064270c ("ring: remove watermark support")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_ring/rte_ring.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index 2a9f768a1c..f4a96ca845 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count);
  * object table. It is advised to use rte_ring_get_memsize() to get the
  * appropriate size.
  *
- * The ring size is set to *count*, which must be a power of two. Water
- * marking is disabled by default. The real usable ring size is
- * *count-1* instead of *count* to differentiate a free ring from an
- * empty ring.
+ * The ring size is set to *count*, which must be a power of two.
+ * The real usable ring size is *count-1* instead of *count* to
+ * differentiate a full ring from an empty ring.
  *
  * The ring is not added in RTE_TAILQ_RING global list. Indeed, the
  * memory given by the caller may not be shareable among dpdk
@@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
  * This function uses ``memzone_reserve()`` to allocate memory. Then it
  * calls rte_ring_init() to initialize an empty ring.
  *
- * The new ring size is set to *count*, which must be a power of
- * two. Water marking is disabled by default. The real usable ring size
- * is *count-1* instead of *count* to differentiate a free ring from an
- * empty ring.
+ * The new ring size is set to *count*, which must be a power of two.
+ * The real usable ring size is *count-1* instead of *count* to
+ * differentiate a full ring from an empty ring.
  *
  * The ring is added in RTE_TAILQ_RING list.
  *
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:51.057214642 +0100
+++ 0017-ring-remove-leftover-comment-about-watermark.patch	2022-11-16 11:36:50.452775701 +0100
@@ -1 +1 @@
-From 21dc24b746a7135dd799b462d9a6479dfd54a92f Mon Sep 17 00:00:00 2001
+From 325a874c84f6962ad534a6882539a021880b6350 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -14 +15 @@
- lib/ring/rte_ring.h | 14 ++++++--------
+ lib/librte_ring/rte_ring.h | 14 ++++++--------
@@ -17,5 +18,5 @@
-diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h
-index 7c48e35d27..7e4cd60650 100644
---- a/lib/ring/rte_ring.h
-+++ b/lib/ring/rte_ring.h
-@@ -66,10 +66,9 @@ ssize_t rte_ring_get_memsize(unsigned int count);
+diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
+index 2a9f768a1c..f4a96ca845 100644
+--- a/lib/librte_ring/rte_ring.h
++++ b/lib/librte_ring/rte_ring.h
+@@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count);
@@ -27 +28 @@
-- * *count-1* instead of *count* to differentiate a full ring from an
+- * *count-1* instead of *count* to differentiate a free ring from an
@@ -35 +36 @@
-@@ -127,10 +126,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
+@@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
@@ -41 +42 @@
-- * is *count-1* instead of *count* to differentiate a full ring from an
+- * is *count-1* instead of *count* to differentiate a free ring from an