From: Linus Torvalds Date: Mon, 30 Mar 2020 19:45:23 +0000 (-0700) Subject: Merge tag 'docs-5.7' of git://git.lwn.net/linux X-Git-Tag: v5.7-rc1~200 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=481ed297d900af0ce395f6ca8975903b76a5a59e;p=users%2Fhch%2Fmisc.git Merge tag 'docs-5.7' of git://git.lwn.net/linux Pull documentation updates from Jonathan Corbet: "This has been a busy cycle for documentation work. Highlights include: - Lots of RST conversion work by Mauro, Daniel ALmeida, and others. Maybe someday we'll get to the end of this stuff...maybe... - Some organizational work to bring some order to the core-api manual. - Various new docs and additions to the existing documentation. - Typo fixes, warning fixes, ..." * tag 'docs-5.7' of git://git.lwn.net/linux: (123 commits) Documentation: x86: exception-tables: document CONFIG_BUILDTIME_TABLE_SORT MAINTAINERS: adjust to filesystem doc ReST conversion docs: deprecated.rst: Add BUG()-family doc: zh_CN: add translation for virtiofs doc: zh_CN: index files in filesystems subdirectory docs: locking: Drop :c:func: throughout docs: locking: Add 'need' to hardirq section docs: conf.py: avoid thousands of duplicate label warning on Sphinx docs: prevent warnings due to autosectionlabel docs: fix reference to core-api/namespaces.rst docs: fix pointers to io-mapping.rst and io_ordering.rst files Documentation: Better document the softlockup_panic sysctl docs: hw-vuln: tsx_async_abort.rst: get rid of an unused ref docs: perf: imx-ddr.rst: get rid of a warning docs: filesystems: fuse.rst: supress a Sphinx warning docs: translations: it: avoid duplicate refs at programming-language.rst docs: driver.rst: supress two ReSt warnings docs: trace: events.rst: convert some new stuff to ReST format Documentation: Add io_ordering.rst to driver-api manual Documentation: Add io-mapping.rst to driver-api manual ... --- 481ed297d900af0ce395f6ca8975903b76a5a59e diff --cc Documentation/filesystems/zonefs.rst index 78813c34ec47,7e733e751e98..71d845c6a700 --- a/Documentation/filesystems/zonefs.rst +++ b/Documentation/filesystems/zonefs.rst @@@ -301,7 -308,8 +308,8 @@@ Mount option zonefs define the "errors=" mount option to allow the user to specify zonefs behavior in response to I/O errors, inode size inconsistencies or zone -condition chages. The defined behaviors are as follow: +condition changes. The defined behaviors are as follow: + * remount-ro (default) * zone-ro * zone-offline diff --cc MAINTAINERS index 8b6e2d85dd47,38f58b85eb06..953478c9a2eb --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3907,10 -3906,10 +3907,10 @@@ W: http://ceph.com T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git T: git git://github.com/ceph/ceph-client.git S: Supported - F: Documentation/filesystems/ceph.txt + F: Documentation/filesystems/ceph.rst F: fs/ceph/ -CERTIFICATE HANDLING: +CERTIFICATE HANDLING M: David Howells M: David Woodhouse L: keyrings@vger.kernel.org @@@ -5937,8 -5937,8 +5937,8 @@@ L: ecryptfs@vger.kernel.or W: http://ecryptfs.org W: https://launchpad.net/ecryptfs T: git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git -S: Supported +S: Odd Fixes - F: Documentation/filesystems/ecryptfs.txt + F: Documentation/filesystems/ecryptfs.rst F: fs/ecryptfs/ EDAC-AMD64