From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A0C7A0613 for ; Tue, 27 Aug 2019 11:31:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 403F254AE; Tue, 27 Aug 2019 11:31:44 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 822ED1C0D6 for ; Tue, 27 Aug 2019 11:31:42 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CDEEF18C892C; Tue, 27 Aug 2019 09:31:41 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7D235C207; Tue, 27 Aug 2019 09:31:40 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Ferruh Yigit , dpdk stable Date: Tue, 27 Aug 2019 10:30:17 +0100 Message-Id: <20190827093032.20423-40-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 27 Aug 2019 09:31:42 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix PDF build' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Tested-by: Ferruh Yigit --- 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: