[dpdk-stable] patch 'doc: fix PDF build' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Tue Aug 27 11:30:17 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.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 09/03/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/bdb49345893dc7e829780e261146cf7ebd9aa231

Thanks.

Kevin Traynor

---
>From bdb49345893dc7e829780e261146cf7ebd9aa231 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 9 Jul 2019 15:11:17 +0200
Subject: [PATCH] doc: fix PDF build

[ upstream commit d3ce1dc637c1bbef9a407f10281b2bc0549256da ]

The command "make doc-guides-pdf" is failing because
there are more than 1500 lines in the file MAINTAINERS
which is included in the contributing guide.

We are facing the issue mentioned in this comment:
https://github.com/sphinx-doc/sphinx/issues/3099#issuecomment-256440704

Anyway the file MAINTAINERS is mentioned several times in the guide.
So the "literalinclude" is removed from the guide to fix the build
of the PDF.

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Tested-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 doc/guides/contributing/patches.rst | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 1bd91b7e7..02cd0555a 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -638,11 +638,2 @@ patch accepted. The general cycle for patch review and acceptance is:
    * Trivial patches may be merged sooner than described above at the tree committer's
      discretion.
-
-DPDK Maintainers
-----------------
-
-The following are the DPDK maintainers as listed in the ``MAINTAINERS`` file
-in the DPDK root directory.
-
-.. literalinclude:: ../../../MAINTAINERS
-   :lines: 3-
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.098506602 +0100
+++ 0040-doc-fix-PDF-build.patch	2019-08-27 09:40:10.935144024 +0100
@@ -1 +1 @@
-From d3ce1dc637c1bbef9a407f10281b2bc0549256da Mon Sep 17 00:00:00 2001
+From bdb49345893dc7e829780e261146cf7ebd9aa231 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d3ce1dc637c1bbef9a407f10281b2bc0549256da ]
+
@@ -24 +26 @@
-index 3b2b174ad..f37fb5557 100644
+index 1bd91b7e7..02cd0555a 100644
@@ -27 +29 @@
-@@ -649,11 +649,2 @@ patch accepted. The general cycle for patch review and acceptance is:
+@@ -638,11 +638,2 @@ patch accepted. The general cycle for patch review and acceptance is:


More information about the stable mailing list