From patchwork Sun Jun 18 23:46:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 105787 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp639683qgd; Sun, 18 Jun 2017 16:47:22 -0700 (PDT) X-Received: by 10.99.156.18 with SMTP id f18mr22866056pge.25.1497829642730; Sun, 18 Jun 2017 16:47:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497829642; cv=none; d=google.com; s=arc-20160816; b=yQzAErU+gYzwTde8zrXeLJW79xXfxJ8RAt9A1THdnPH+yjX68UoZ8q6EZEgmwTseHr 4m1iA/B8xjcJmYVZ5oT2qlX+w5S+KGiD5KzpVu9kDO0popfxTuwmVlgBvKbqlJCIQqGh OBkzgyTEs1NCqS9ffvIBI2+SSCgiFYGXvl+aFODUDPufQQAw/+L5ZcCHKGSOyd/DSo3p ccWJWqxehEgbZG5l4/aDvS64PHquq96RGwOt3qOorrP8bYt2Jpco5x1tSmND1a8EYAoe VZ4A6tlgLLwW/+uObWfyAqH0IQb3STXBki/94dBj4wMsubTI1LQP43ZcZTnOO+jDy7g4 9X8Q== 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=/18BW+d018PeZ44TIUPFNPvzZahtIke0GpBn5RlpBXs=; b=0qcMxUoi1RdXIKtVEB3BBoOrIx+VeDIaVWGolIjyBqM48/0pHy8EUG/QmUTI7cehTY L5ss8vnCrLD1QD9BUrVSP/YhQnRdj/1HGkeRlLQY33oDmxfzaoJgPRXskb8DFaR17i1v FQjLD+5CHVmTOauf9VJdHk0svkEhhlL67LO8VNDkCbqym4VWC8gqL8uAD3oZUs6dvjl4 taegrMdwzbJE9c3zbMSkbtsC49cxJLAc9vZciqdJr4deTfsGSzt2xImypvBjra6iG8HZ 4kRm5cBY1lqvdqVDNWfnxvPgs+GygItLPztrd6xr3Pxks7JBR2R+Floh24Rnrwu5j55m YESg== 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:22 -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 S1753351AbdFRXqx (ORCPT + 25 others); Sun, 18 Jun 2017 19:46:53 -0400 Received: from ms.lwn.net ([45.79.88.28]:43136 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbdFRXqt (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 8E6322CC; 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 , Mauro Carvalho Chehab Subject: [PATCH 1/5] Docs: Include the Latex "ifthen" package Date: Sun, 18 Jun 2017 17:46:26 -0600 Message-Id: <20170618234630.19964-2-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 Otherwise we get PDF build failures when LaTeX refused to acknowledge the existence of \ifthenelse Fixes: 41cff161fe99d1c6a773becc2250a1dc3ac035ff Cc: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/conf.py | 1 + 1 file changed, 1 insertion(+) -- 2.13.1 diff --git a/Documentation/conf.py b/Documentation/conf.py index bacf9d337c89..93827bc1620f 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -273,6 +273,7 @@ latex_elements = { 'preamble': ''' % Adjust margins \\usepackage[margin=0.5in, top=1in, bottom=1in]{geometry} + \\usepackage{ifthen} % Allow generate some pages in landscape \\usepackage{lscape} 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 From patchwork Sun Jun 18 23:46:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 105791 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp639752qgd; Sun, 18 Jun 2017 16:47:39 -0700 (PDT) X-Received: by 10.98.34.8 with SMTP id i8mr22274259pfi.194.1497829659238; Sun, 18 Jun 2017 16:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497829659; cv=none; d=google.com; s=arc-20160816; b=hBGAzGaqBFR6J1Adu8c1uGeYQSx/PQnAzPmJE3Q3iaxAL1Dzd6WE4bs4kZJwL1mCBw xXSi4FEzp9F8IQInJCwuEgfEg82TRGYRPZxqkpxzuDhUSjj5GiFWmT5fE1sK+Pl68wAe meDoRQ4UXNhxAT8uV+mk5yI9KUBAaSRlHqdkzl3HECJFCYyE3LVokPixSmz8Dg5v/K9X l8Q4VCSTgEx2MBnzCVeNN53uUheBY/7b1b3JVD+I2RTZ7CyZ6DXvhg+YMZYMPfEdPtVV J8IuhQC8h6lygBjzkHw2G1kE3n5/BCHW8c7Pfhp+M8KT13OuNSL/LEdMtdrr40kQElL9 h1lA== 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=aFEhMq2zk2eueU3EA/U2pCYPnUypI/N/0pRv8UQ/lKU=; b=sAikXGtpoxSMOLplyRiBH80NsEUqvFiykTx7WrkAnjKyQdEnpbhULhYmQ1ob7l1J1b DFsIQUZGbeXU5sS690qm9xIHq0zHGVheraji9XZa46T5EI3IcpnED2Tme6dFoV8dTQdq gUtJw6F3vQnkT5/1DNDVP5MGxU9ZPcdnAfFPmmibhy2wCy1Y9d2xiPsNlcia6b2VK5Vh yd9yduEo7w4ESuL/FZlIcoCvAcjgbOVqovx1SYch/3XokRXyF/zV3seXSXFvKwwhIEQ5 H49QHoQ1m8uXiK3uNVYkRXkapiotWbAz6FhMKyBF0yntia4UsniGYkCo7YLHRY37oiPY LhpQ== 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 o24si7933633pli.552.2017.06.18.16.47.38; Sun, 18 Jun 2017 16:47:39 -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 S1753405AbdFRXra (ORCPT + 25 others); Sun, 18 Jun 2017 19:47:30 -0400 Received: from ms.lwn.net ([45.79.88.28]:43156 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753258AbdFRXqu (ORCPT ); Sun, 18 Jun 2017 19:46:50 -0400 Received: from dt.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id 614632CD; Sun, 18 Jun 2017 23:46:49 +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 3/5] Docs: fix table problems in ras.rst Date: Sun, 18 Jun 2017 17:46:28 -0600 Message-Id: <20170618234630.19964-4-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 Two table problems caused the PDF build to fail: - Evidently multirow cells are not appreciated in table headers, so remove such from the "CS Rows" table. - The logging message structure table was incorrectly formatted, with two "+" instead of "|". The HTML build is forgiving of such things, but PDF is not. Cc: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/admin-guide/ras.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.13.1 diff --git a/Documentation/admin-guide/ras.rst b/Documentation/admin-guide/ras.rst index 8c7bbf2c88d2..197896718f81 100644 --- a/Documentation/admin-guide/ras.rst +++ b/Documentation/admin-guide/ras.rst @@ -344,9 +344,9 @@ for more than 2 channels, like Fully Buffered DIMMs (FB-DIMMs) memory controllers. The following example will assume 2 channels: +------------+-----------------------+ - | Chip | Channels | - | Select +-----------+-----------+ - | rows | ``ch0`` | ``ch1`` | + | CS Rows | Channels | + +------------+-----------+-----------+ + | | ``ch0`` | ``ch1`` | +============+===========+===========+ | ``csrow0`` | DIMM_A0 | DIMM_B0 | +------------+ | | @@ -698,7 +698,7 @@ information indicating that errors have been detected:: The structure of the message is: +---------------------------------------+-------------+ - | Content + Example | + | Content | Example | +=======================================+=============+ | The memory controller | MC0 | +---------------------------------------+-------------+ @@ -713,7 +713,7 @@ The structure of the message is: +---------------------------------------+-------------+ | The error syndrome | 0xb741 | +---------------------------------------+-------------+ - | Memory row | row 0 + + | Memory row | row 0 | +---------------------------------------+-------------+ | Memory channel | channel 1 | +---------------------------------------+-------------+ From patchwork Sun Jun 18 23:46:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 105790 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp639749qgd; Sun, 18 Jun 2017 16:47:38 -0700 (PDT) X-Received: by 10.98.34.152 with SMTP id p24mr21681313pfj.60.1497829658754; Sun, 18 Jun 2017 16:47:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497829658; cv=none; d=google.com; s=arc-20160816; b=YJ4m9fvbZsS6dZ1zixm64FeXRuLjWouJLiNDYsqlzczMgaUkCAotu8Z9R9wM8JrbrI SMOPiyMRuNt1KrB/1FXBJoFffTzoQFk92CxCHiv+MTDWurrp64MhJcvCr/eUafrRW/QX d9MXSGIg4NpvYTI/hOB6olHM9PyUAAcRDgCH/lxfJYZC/wW25iBpcje2t3WD7GrQE+wZ 323GPL++ZJEGaT8fZt9Gvb5Ibc6ofTGFnBF8hQnolWxP+blEmeXwesiLfwBAPH+jDTTm +Y5imMhfUkt6dMTUWtTgsvAlvLAQGnHanJBt8FX0Pwro6mxHEVRY0zbWjZNCJuHp0BYR aGeg== 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=Q4vfsnNMxhl+q0e7KpJ7Jq5rIkOF51CfFEFvfHEAcVI=; b=sTwPOdv0LFK4m+FCe6UqClKPpASmZHTeM3fmiJI2+P4WiSSMdaADgjMVeFJl8nO70p ZVqelLqjt1FZizON12uWQM+c6oeNVffLcBFmPptcZ8nA3PZw3+RsBB685HidpGXgdLJE KQF45Bbg+HjbG2GS8NzvXpw/Aulp7SErRFRaBIx0QS22tAyzwC8F52QWcYn0fZlrEnUM Xhb5KMuSxoRhRpuOp2nD/53M4xBMOVjPvP1ABbpZkEJHyX1ApfykgIltVvlF+qKxKo0X aTRUVS68Y4Gh4z0mKORHYbiEVwlQEVhTZei94d7DR4nsiXc8Chh4tcIfkOong8MFYQ5B hpVA== 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 o24si7933633pli.552.2017.06.18.16.47.38; Sun, 18 Jun 2017 16:47:38 -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 S1753387AbdFRXr2 (ORCPT + 25 others); Sun, 18 Jun 2017 19:47:28 -0400 Received: from ms.lwn.net ([45.79.88.28]:43160 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753261AbdFRXqu (ORCPT ); Sun, 18 Jun 2017 19:46:50 -0400 Received: from dt.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id BFE6A3470; Sun, 18 Jun 2017 23:46:49 +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 4/5] Docs: Use kernel-figure in vidioc-g-selection.rst Date: Sun, 18 Jun 2017 17:46:29 -0600 Message-Id: <20170618234630.19964-5-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 ...otherwise the PDF build fails when it can't find constraints.pdf. CC: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/v4l/vidioc-g-selection.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.13.1 diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst index deb1f6fb473b..b80d85cb8891 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-selection.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-selection.rst @@ -129,8 +129,8 @@ Selection targets and flags are documented in .. _sel-const-adjust: -.. figure:: constraints.* - :alt: constraints.pdf / constraints.svg +.. kernel-figure:: constraints.svg + :alt: constraints.svg :align: center Size adjustments with constraint flags. From patchwork Sun Jun 18 23:46:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 105789 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp639689qgd; Sun, 18 Jun 2017 16:47:24 -0700 (PDT) X-Received: by 10.98.82.200 with SMTP id g191mr22126307pfb.181.1497829644769; Sun, 18 Jun 2017 16:47:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497829644; cv=none; d=google.com; s=arc-20160816; b=CyRDsTOwBzPuIkpPqibE7f1x4GNm02ul0Z6G+tqobleA88AdEdojDr0K+MQnD0wrTh JjiEo5s4BLyZuAuVWwwK6ujloMa8T4e3ZHnhFITWYKOop3k39D/sUyW1NHt5lFUqmVH/ eIvKb7uJgHTgirlghO+B1YuPPu1VBKK4d1O1gKktRXCEzyavvQnc4mnxQxIaXtoBZVoC gBE7XRWXutGe1h9xeA/N8kxvkHEaalmiBF62O1mP4lg0yCwKQydDTl4AfpwdDkNMIAcJ C6h47Kmhd5vCM3WEswZck2f5iQ1a04QBLDbwInvbYwzXlIW2NA5u2lHkcxwsuycJsQPL gM+g== 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=Bsr7iDxrpfRA57UxTBcDmvK0Zev8IJ5z9DGL2rI1C1k=; b=BdKc11auqYj0Y+8CPh02lrpebwILSUK5fABM/aM8qnsvX06fo0wL6EX5Zdeoa1z/eZ qCkwmsJxrYoKlXLxRUXuaxHAz19ppL5kELL6Pu/mtWqCQz8o6DCdg1XqOGToS6d4hfO7 O7sr8zcOTplUQ+fCi6X0moZRpLHuKAl/oXi8EBiGXOPFQkPT9hXkb38wqWPtZKJrRMwV X+dDbepVuAP93PuTqBx1DewMIJ3xrJw37+/4aHZh4iGcX4fd5oM3oRTHuODHP1/vnDTq spvyXfEMleYmEGrAxbEevJ0oKfvitbUgzdIGocfBiXYpwVHVvBhCaCT0nDgg+G1ZYOXs x0ZQ== 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.23; Sun, 18 Jun 2017 16:47:24 -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 S1753371AbdFRXrL (ORCPT + 25 others); Sun, 18 Jun 2017 19:47:11 -0400 Received: from ms.lwn.net ([45.79.88.28]:43170 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265AbdFRXqv (ORCPT ); Sun, 18 Jun 2017 19:46:51 -0400 Received: from dt.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id 2ACA3312; Sun, 18 Jun 2017 23:46:50 +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 , Neil Armstrong Subject: [PATCH 5/5] DRM: Fix an incorrectly formatted table Date: Sun, 18 Jun 2017 17:46:30 -0600 Message-Id: <20170618234630.19964-6-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 The "supported input formats" table in dw_hdmi.h was incorrectly formatted, using "+" signs where "|" needs to be. That, in turn, causes the PDF build to fail. Fixes: def23aa7e9821a3dfe3fb7b139dd0229a89fdeb0 Cc: Neil Armstrong Cc: Daniel Vetter Signed-off-by: Jonathan Corbet --- include/drm/bridge/dw_hdmi.h | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) -- 2.13.1 diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index ed599bea3f6c..c00671fef53c 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -22,56 +22,56 @@ struct dw_hdmi; * 48bit bus. * * +----------------------+----------------------------------+------------------------------+ - * + Format Name + Format Code + Encodings + + * | Format Name | Format Code | Encodings | * +----------------------+----------------------------------+------------------------------+ - * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + + * | RGB 4:4:4 8bit | ``MEDIA_BUS_FMT_RGB888_1X24`` | ``V4L2_YCBCR_ENC_DEFAULT`` | * +----------------------+----------------------------------+------------------------------+ - * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30`` + ``V4L2_YCBCR_ENC_DEFAULT`` + + * | RGB 4:4:4 10bits | ``MEDIA_BUS_FMT_RGB101010_1X30`` | ``V4L2_YCBCR_ENC_DEFAULT`` | * +----------------------+----------------------------------+------------------------------+ - * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36`` + ``V4L2_YCBCR_ENC_DEFAULT`` + + * | RGB 4:4:4 12bits | ``MEDIA_BUS_FMT_RGB121212_1X36`` | ``V4L2_YCBCR_ENC_DEFAULT`` | * +----------------------+----------------------------------+------------------------------+ - * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48`` + ``V4L2_YCBCR_ENC_DEFAULT`` + + * | RGB 4:4:4 16bits | ``MEDIA_BUS_FMT_RGB161616_1X48`` | ``V4L2_YCBCR_ENC_DEFAULT`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + - * + + + or ``V4L2_YCBCR_ENC_XV601`` + - * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * | YCbCr 4:4:4 8bit | ``MEDIA_BUS_FMT_YUV8_1X24`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | + * | | | or ``V4L2_YCBCR_ENC_XV601`` | + * | | | or ``V4L2_YCBCR_ENC_XV709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + - * + + + or ``V4L2_YCBCR_ENC_XV601`` + - * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * | YCbCr 4:4:4 10bits | ``MEDIA_BUS_FMT_YUV10_1X30`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | + * | | | or ``V4L2_YCBCR_ENC_XV601`` | + * | | | or ``V4L2_YCBCR_ENC_XV709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + - * + + + or ``V4L2_YCBCR_ENC_XV601`` + - * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * | YCbCr 4:4:4 12bits | ``MEDIA_BUS_FMT_YUV12_1X36`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | + * | | | or ``V4L2_YCBCR_ENC_XV601`` | + * | | | or ``V4L2_YCBCR_ENC_XV709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + - * + + + or ``V4L2_YCBCR_ENC_XV601`` + - * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * | YCbCr 4:4:4 16bits | ``MEDIA_BUS_FMT_YUV16_1X48`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | + * | | | or ``V4L2_YCBCR_ENC_XV601`` | + * | | | or ``V4L2_YCBCR_ENC_XV709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:2 8bit | ``MEDIA_BUS_FMT_UYVY8_1X16`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:2 10bits | ``MEDIA_BUS_FMT_UYVY10_1X20`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:2 12bits | ``MEDIA_BUS_FMT_UYVY12_1X24`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYYVYY8_0_5X24`` + ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:0 8bit | ``MEDIA_BUS_FMT_UYYVYY8_0_5X24`` | ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYYVYY10_0_5X30``+ ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:0 10bits | ``MEDIA_BUS_FMT_UYYVYY10_0_5X30``| ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYYVYY12_0_5X36``+ ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:0 12bits | ``MEDIA_BUS_FMT_UYYVYY12_0_5X36``| ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ - * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYYVYY16_0_5X48``+ ``V4L2_YCBCR_ENC_601`` + - * + + + or ``V4L2_YCBCR_ENC_709`` + + * | YCbCr 4:2:0 16bits | ``MEDIA_BUS_FMT_UYYVYY16_0_5X48``| ``V4L2_YCBCR_ENC_601`` | + * | | | or ``V4L2_YCBCR_ENC_709`` | * +----------------------+----------------------------------+------------------------------+ */