Merge branch 'docs-fixes' into docs-next (ee98fac8) · Commits · 戴 / test

.mailmap

+5 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,11 @@ Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
		Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
		Jens Axboe <axboe@suse.de>
		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
		Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
		Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
		Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
		Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
		Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

+156 −156

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ Mount Options
		=============


		====================== ============================================================
		======================== ============================================================
		background_gc=%s Turn on/off cleaning operations, namely garbage
		collection, triggered in background when I/O subsystem is
		idle. If background_gc=on, it will turn on the garbage
		@@ -258,7 +258,7 @@ compress_extension=%s Support adding specified extension, so that f2fs can enab
		on compression extension list and enable compression on
		these file by default rather than to enable it via ioctl.
		For other files, we can still enable compression via ioctl.
		====================== ============================================================
		======================== ============================================================

		Debugfs Entries
		===============

+4 −4

Original line number	Diff line number	Diff line
		@@ -2881,7 +2881,7 @@ S: Supported
		F: drivers/net/wireless/ath/*

		ATHEROS ATH5K WIRELESS DRIVER
		M: Jiri Slaby <jirislaby@gmail.com>
		M: Jiri Slaby <jirislaby@kernel.org>
		M: Nick Kossifidis <mickflemm@gmail.com>
		M: Luis Chamberlain <mcgrof@kernel.org>
		L: linux-wireless@vger.kernel.org
		@@ -11560,7 +11560,7 @@ F: drivers/media/pci/meye/
		F: include/uapi/linux/meye.h

		MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
		M: Jiri Slaby <jirislaby@gmail.com>
		M: Jiri Slaby <jirislaby@kernel.org>
		S: Maintained
		F: Documentation/driver-api/serial/moxa-smartio.rst
		F: drivers/tty/mxser.*
		@@ -15348,7 +15348,7 @@ F: scripts/selinux/
		F: security/selinux/

		SENSABLE PHANTOM
		M: Jiri Slaby <jirislaby@gmail.com>
		M: Jiri Slaby <jirislaby@kernel.org>
		S: Maintained
		F: drivers/misc/phantom.c
		F: include/uapi/linux/phantom.h
		@@ -17365,7 +17365,7 @@ K: ^Subject:.*(?i)trivial

		TTY LAYER
		M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		M: Jiri Slaby <jslaby@suse.com>
		M: Jiri Slaby <jirislaby@kernel.org>
		S: Supported
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
		F: Documentation/driver-api/serial/

+0 −4

Original line number	Diff line number	Diff line
		@@ -323,10 +323,6 @@ sub check_sphinx()
		$rec_sphinx_upgrade = 1;
		return;
		}
		if ($cur_version lt $min_pdf_version) {
		$rec_sphinx_upgrade = 1;
		return;
		}

		# On version check mode, just assume Sphinx has all mandatory deps
		exit (0) if ($version_check);