[dpdk-stable] patch 'doc: fix build issue in ABI guide' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri May 22 11:39:48 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. 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 2e33e6b1448e9f70a4a56dfc35d2e8ef9431bcda Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at mellanox.com>
Date: Tue, 19 May 2020 10:36:53 +0300
Subject: [PATCH] doc: fix build issue in ABI guide

[ upstream commit efdda86bd4151dc2819ee4be5c6f3cb9245a84e8 ]

doc/guides/contributing/abi_versioning.rst:416:
 ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.

.. code-block::

   use_function_versioning = true

Fixes: 45a4103e680d ("doc: fix default symbol binding in ABI guide")

Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
Acked-by: Ray Kinsella <mdr at ashroe.eu>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 doc/guides/contributing/abi_versioning.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index e526fb179a..d4fe93bb3c 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -408,7 +408,7 @@ Finally, we need to indicate to the :doc:`meson/ninja build system
 library or driver. In the libraries or driver where we have added symbol
 versioning, in the ``meson.build`` file we add the following
 
-.. code-block::
+.. code-block:: none
 
    use_function_versioning = true
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.569905573 +0100
+++ 0009-doc-fix-build-issue-in-ABI-guide.patch	2020-05-22 10:37:39.064411567 +0100
@@ -1,8 +1,10 @@
-From efdda86bd4151dc2819ee4be5c6f3cb9245a84e8 Mon Sep 17 00:00:00 2001
+From 2e33e6b1448e9f70a4a56dfc35d2e8ef9431bcda Mon Sep 17 00:00:00 2001
 From: Raslan Darawsheh <rasland at mellanox.com>
 Date: Tue, 19 May 2020 10:36:53 +0300
 Subject: [PATCH] doc: fix build issue in ABI guide
 
+[ upstream commit efdda86bd4151dc2819ee4be5c6f3cb9245a84e8 ]
+
 doc/guides/contributing/abi_versioning.rst:416:
  ERROR: Error in "code-block" directive:
 1 argument(s) required, 0 supplied.
@@ -21,10 +23,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
-index ef881877f1..f4a9273afc 100644
+index e526fb179a..d4fe93bb3c 100644
 --- a/doc/guides/contributing/abi_versioning.rst
 +++ b/doc/guides/contributing/abi_versioning.rst
-@@ -413,7 +413,7 @@ Finally, we need to indicate to the :doc:`meson/ninja build system
+@@ -408,7 +408,7 @@ Finally, we need to indicate to the :doc:`meson/ninja build system
  library or driver. In the libraries or driver where we have added symbol
  versioning, in the ``meson.build`` file we add the following
  


More information about the stable mailing list