From d04e628f002b60ac67cc79f6a433a76cc82a0769 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 20 Apr 2018 00:50:39 +0100 Subject: [PATCH] Documentation: typec.rst: Use literal-block element with ascii art This fixes a fatal error in the doc build process. --- debian/changelog | 1 + ...pec.rst-use-literal-block-element-wi.patch | 31 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch diff --git a/debian/changelog b/debian/changelog index c003dc1f5..35d286d8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.17~rc1-1~exp1) UNRELEASED; urgency=medium * Drop our patch "Kbuild: kconfig: Verbose version of --listnewconfig"; listnewconfig now shows symbol values by default * debian/rules.real: Stop enabling verbose output for listnewconfig target + * Documentation: typec.rst: Use literal-block element with ascii art -- Ben Hutchings Thu, 19 Apr 2018 21:37:24 +0100 diff --git a/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch b/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch new file mode 100644 index 000000000..e09f3bbb1 --- /dev/null +++ b/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch @@ -0,0 +1,31 @@ +From: Heikki Krogerus +Date: Fri, 6 Apr 2018 15:41:22 +0300 +Subject: Documentation: typec.rst: Use literal-block element with ascii art +Origin: git://git.lwn.net/linux.git#6d9094862b70020c684588147e5eff52dec19c8d + +Using reStructuredText literal-block element with ascii-art. +That prevents the ascii art from being processed as +reStructuredText. + +Reported-by: Masanari Iida +Reviewed-and-tested-by: Jani Nikula +Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers") +Signed-off-by: Heikki Krogerus +Signed-off-by: Jonathan Corbet +--- + Documentation/driver-api/usb/typec.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/driver-api/usb/typec.rst +index feb31946490b..48ff58095f11 100644 +--- a/Documentation/driver-api/usb/typec.rst ++++ b/Documentation/driver-api/usb/typec.rst +@@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data + role. USB Type-C Connector Class does not supply separate API for them. The + port drivers can use USB Role Class API with those. + +-Illustration of the muxes behind a connector that supports an alternate mode: ++Illustration of the muxes behind a connector that supports an alternate mode:: + + ------------------------ + | Connector | diff --git a/debian/patches/series b/debian/patches/series index e0c3b92f6..4781a2d68 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -79,6 +79,7 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch debian/revert-objtool-fix-config_stack_validation-y-warning.patch bugfix/all/i40e-build-for-64-bit-targets-only.patch +bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch # Miscellaneous features