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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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/21/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.

Thanks.

Luca Boccassi

---
>From 074a6d6927a4ef58e03bdbeea7e3fdda9a0356a6 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 4000906289..fe15e9afd7 100644
--- a/doc/guides/contributing/versioning.rst
+++ b/doc/guides/contributing/versioning.rst
@@ -149,11 +149,11 @@ library so that older binaries need not be immediately recompiled.
 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
   fully qualified function ``p``, so that if a symbol becomes versioned, it
diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h
index 41e8032ba1..f45b434f1b 100644
--- a/lib/librte_compat/rte_compat.h
+++ b/lib/librte_compat/rte_compat.h
@@ -63,14 +63,14 @@
 /*
  * 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))
 
 /*
  * 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))
 #define __vsym __attribute__((used))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.304519073 +0000
+++ 0100-doc-fix-description-of-versioning-macros.patch	2019-12-19 14:32:26.233300364 +0000
@@ -1,26 +1,27 @@
-From 519e6548f7a679d769182866a71df98f6b6a85d8 Mon Sep 17 00:00:00 2001
+From 074a6d6927a4ef58e03bdbeea7e3fdda9a0356a6 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")
-Cc: stable at dpdk.org
 
 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_eal/common/include/rte_function_versioning.h | 4 ++--
+ 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 64984c54e6..8a38928c02 100644
+index 4000906289..fe15e9afd7 100644
 --- a/doc/guides/contributing/versioning.rst
 +++ b/doc/guides/contributing/versioning.rst
-@@ -215,11 +215,11 @@ library so that older binaries need not be immediately recompiled.
+@@ -149,11 +149,11 @@ library so that older binaries need not be immediately recompiled.
  The macros exported are:
  
  * ``VERSION_SYMBOL(b, e, n)``: Creates a symbol version table entry binding
@@ -34,11 +35,11 @@
  
  * ``MAP_STATIC_SYMBOL(f, p)``: Declare the prototype ``f``, and map it to the
    fully qualified function ``p``, so that if a symbol becomes versioned, it
-diff --git a/lib/librte_eal/common/include/rte_function_versioning.h b/lib/librte_eal/common/include/rte_function_versioning.h
-index 55e88ffae6..eae619d605 100644
---- a/lib/librte_eal/common/include/rte_function_versioning.h
-+++ b/lib/librte_eal/common/include/rte_function_versioning.h
-@@ -42,14 +42,14 @@
+diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h
+index 41e8032ba1..f45b434f1b 100644
+--- a/lib/librte_compat/rte_compat.h
++++ b/lib/librte_compat/rte_compat.h
+@@ -63,14 +63,14 @@
  /*
   * VERSION_SYMBOL
   * Creates a symbol version table entry binding symbol <b>@DPDK_<n> to the internal