From patchwork Sun Jun 18 23:46:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 105788 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp639685qgd; Sun, 18 Jun 2017 16:47:23 -0700 (PDT) X-Received: by 10.98.223.9 with SMTP id u9mr21891458pfg.98.1497829643672; Sun, 18 Jun 2017 16:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497829643; cv=none; d=google.com; s=arc-20160816; b=Nes5K4uIlw9LFykc03w/zZbjqCKQUmRDdXufQTBBlVqBExOllblwD/91YQU6/hIZHB I2xEhZlfBSR3Z3BU60lZsFKcy5PqX8yhim/6xFmSf796RrgqcofFPHtuuSynsIrZk+T+ Ysj+0sN3qkb0qsTRONw0eKvInysBKKm7oUAGeW1V/AQSfiA8EC3uNB/zb2c3uaeWyUZb WZmcdgLIaSS3wEVRZyIr+zlor3RkOK22PfDgh8VuvmrXDu0dAW5gC7Fu+G5NeZTzG803 fHDN9NMmYLHDS1H9ajvy6MlJxj2COV8MmudnaHEbHB4g3LcSg37OCI8szbJGOiYC4X80 GQ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=HT2Rki1rQvlct6aKPsVQMK2GVVn+plkqgxzMG4Xg6Uk=; b=Tr01f4QaxMSV2XLpvFtVWeaUmw8uCQ6VH/hCfSayi4n1KYrH8ObqovcWMnP9sBXGFx bHxPTubKogTQqAVGOr/884sqOkNjNuXvhBjnbMCq7K/iUMeA5WIiY/VRpJ0VXf/SEF+u 7Pp2g4X+IdyEslsbAMzjkNqpe2k2rJWBeaR0Dc/UKX6Y3XVCFpzH0JP+NySdke1j8raZ 9w/3OZenOq1oF4mcYxNMEVayelMaif/NYV9Nc8g36tLtFMLZqRdhYfgYhQQ64X7tVswp L39cVJtiLCtsBh/7IjIcRkpMBTIPGpGukWZ63HVH51jnhqCP2ySI9yvQTDdQ/oRuCXm8 vN1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r7si2540249pgu.284.2017.06.18.16.47.22; Sun, 18 Jun 2017 16:47:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753325AbdFRXqv (ORCPT + 25 others); Sun, 18 Jun 2017 19:46:51 -0400 Received: from ms.lwn.net ([45.79.88.28]:43146 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753108AbdFRXqt (ORCPT ); Sun, 18 Jun 2017 19:46:49 -0400 Received: from dt.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id 02F39312; Sun, 18 Jun 2017 23:46:48 +0000 (UTC) From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jim Davis , Mauro Carvalho Chehab , Daniel Vetter , Jonathan Corbet Subject: [PATCH 2/5] Docs: Remove redundant geometry package inclusion Date: Sun, 18 Jun 2017 17:46:27 -0600 Message-Id: <20170618234630.19964-3-corbet@lwn.net> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170618234630.19964-1-corbet@lwn.net> References: <20170618234630.19964-1-corbet@lwn.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 85c21e5c3ee7 (docs-rst: better adjust margins and font size) added a \usepackage{geometry} that conflicts with another inclusion deep within the dependencies somewhere, causing the the PDF build to fail with a "conflicting parameters" error. Just remove it for now until we can figure out a better way. Fixes: 85c21e5c3ee74fb75d690c57f7066bae7e2dca55 Cc: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/conf.py | 2 -- 1 file changed, 2 deletions(-) -- 2.13.1 diff --git a/Documentation/conf.py b/Documentation/conf.py index 93827bc1620f..3d4e89330044 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -271,8 +271,6 @@ latex_elements = { # Additional stuff for the LaTeX preamble. 'preamble': ''' - % Adjust margins - \\usepackage[margin=0.5in, top=1in, bottom=1in]{geometry} \\usepackage{ifthen} % Allow generate some pages in landscape