[dpdk-stable] patch 'doc: fix description of versioning macros' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/16/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 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/65ccd7c1cb03143bf019b6dcfc5ba2184d02a9a6

Thanks.

Kevin.

---
>From 65ccd7c1cb03143bf019b6dcfc5ba2184d02a9a6 Mon Sep 17 00:00:00 2001
From: Andrzej Ostruszka <aostruszka at marvell.com>
Date: Thu, 7 Nov 2019 16:03:07 +0100
Subject: [PATCH] doc: fix description of versioning macros

[ upstream commit 519e6548f7a679d769182866a71df98f6b6a85d8 ]

This patch fixes documentation of versioning macros so that they are
aligned with their implementation (no underscore is added by macros).

Fixes: f1ef9794f9bd ("doc: add ABI guidelines")

Signed-off-by: Andrzej Ostruszka <aostruszka at marvell.com>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
---
 doc/guides/contributing/versioning.rst | 4 ++--
 lib/librte_compat/rte_compat.h         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst
index fe17c7f13..32618fc83 100644
--- a/doc/guides/contributing/versioning.rst
+++ b/doc/guides/contributing/versioning.rst
@@ -177,9 +177,9 @@ The macros exported are:
 
 * ``VERSION_SYMBOL(b, e, n)``: Creates a symbol version table entry binding
-  versioned symbol ``b at DPDK_n`` to the internal function ``b_e``.
+  versioned symbol ``b at DPDK_n`` to the internal function ``be``.
 
 * ``BIND_DEFAULT_SYMBOL(b, e, n)``: Creates a symbol version entry instructing
   the linker to bind references to symbol ``b`` to the internal symbol
-  ``b_e``.
+  ``be``.
 
 * ``MAP_STATIC_SYMBOL(f, p)``: Declare the prototype ``f``, and map it to the
diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h
index 92ff28faf..c5a454f4c 100644
--- a/lib/librte_compat/rte_compat.h
+++ b/lib/librte_compat/rte_compat.h
@@ -39,5 +39,5 @@
  * VERSION_SYMBOL
  * Creates a symbol version table entry binding symbol <b>@DPDK_<n> to the internal
- * function name <b>_<e>
+ * function name <b><e>
  */
 #define VERSION_SYMBOL(b, e, n) __asm__(".symver " RTE_STR(b) RTE_STR(e) ", " RTE_STR(b) "@DPDK_" RTE_STR(n))
@@ -46,5 +46,5 @@
  * BIND_DEFAULT_SYMBOL
  * Creates a symbol version entry instructing the linker to bind references to
- * symbol <b> to the internal symbol <b>_<e>
+ * symbol <b> to the internal symbol <b><e>
  */
 #define BIND_DEFAULT_SYMBOL(b, e, n) __asm__(".symver " RTE_STR(b) RTE_STR(e) ", " RTE_STR(b) "@@DPDK_" RTE_STR(n))
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:42.336545538 +0000
+++ 0049-doc-fix-description-of-versioning-macros.patch	2019-12-10 14:49:39.081457227 +0000
@@ -1 +1 @@
-From 519e6548f7a679d769182866a71df98f6b6a85d8 Mon Sep 17 00:00:00 2001
+From 65ccd7c1cb03143bf019b6dcfc5ba2184d02a9a6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 519e6548f7a679d769182866a71df98f6b6a85d8 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- doc/guides/contributing/versioning.rst                  | 4 ++--
- lib/librte_eal/common/include/rte_function_versioning.h | 4 ++--
+ doc/guides/contributing/versioning.rst | 4 ++--
+ lib/librte_compat/rte_compat.h         | 4 ++--
@@ -20 +21 @@
-index 64984c54e..8a38928c0 100644
+index fe17c7f13..32618fc83 100644
@@ -23 +24 @@
-@@ -216,9 +216,9 @@ The macros exported are:
+@@ -177,9 +177,9 @@ The macros exported are:
@@ -35,5 +36,5 @@
-diff --git a/lib/librte_eal/common/include/rte_function_versioning.h b/lib/librte_eal/common/include/rte_function_versioning.h
-index 55e88ffae..eae619d60 100644
---- a/lib/librte_eal/common/include/rte_function_versioning.h
-+++ b/lib/librte_eal/common/include/rte_function_versioning.h
-@@ -43,5 +43,5 @@
+diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h
+index 92ff28faf..c5a454f4c 100644
+--- a/lib/librte_compat/rte_compat.h
++++ b/lib/librte_compat/rte_compat.h
+@@ -39,5 +39,5 @@
@@ -46 +47 @@
-@@ -50,5 +50,5 @@
+@@ -46,5 +46,5 @@