ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'docs-fixes' into docs-next

Browse Source 
Bring a handful of (relatively) urgent fixes into docs-next as well.
This commit is contained in:
Jonathan Corbet
2020-06-26 09:36:23 -06:00
parent 46e906144c 7d9c29bb6c
commit ee98fac8e0
4 changed files with 164 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.mailmap
View File

@@ -131,6 +131,11 @@ Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
Jens Axboe <axboe@suse.de> Jens Axboe <axboe@suse.de>
Jens Osterkamp <Jens.Osterkamp@de.ibm.com> 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> <jhovold@gmail.com>
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

4
Documentation/filesystems/f2fs.rst
View File

@@ -101,7 +101,7 @@ Mount Options
============= =============
====================== ============================================================ ======================== ============================================================
background_gc=%s Turn on/off cleaning operations, namely garbage background_gc=%s Turn on/off cleaning operations, namely garbage
collection, triggered in background when I/O subsystem is collection, triggered in background when I/O subsystem is
idle. If background_gc=on, it will turn on the garbage 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 on compression extension list and enable compression on
these file by default rather than to enable it via ioctl. these file by default rather than to enable it via ioctl.
For other files, we can still enable compression via ioctl. For other files, we can still enable compression via ioctl.
====================== ============================================================ ======================== ============================================================
Debugfs Entries Debugfs Entries
=============== ===============

8
MAINTAINERS
View File

@@ -2881,7 +2881,7 @@ S: Supported
F: drivers/net/wireless/ath/* F: drivers/net/wireless/ath/*
ATHEROS ATH5K WIRELESS DRIVER ATHEROS ATH5K WIRELESS DRIVER
M: Jiri Slaby <jirislaby@gmail.com> M: Jiri Slaby <jirislaby@kernel.org>
M: Nick Kossifidis <mickflemm@gmail.com> M: Nick Kossifidis <mickflemm@gmail.com>
M: Luis Chamberlain <mcgrof@kernel.org> M: Luis Chamberlain <mcgrof@kernel.org>
L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org
@@ -11560,7 +11560,7 @@ F: drivers/media/pci/meye/
F: include/uapi/linux/meye.h F: include/uapi/linux/meye.h
MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
M: Jiri Slaby <jirislaby@gmail.com> M: Jiri Slaby <jirislaby@kernel.org>
S: Maintained S: Maintained
F: Documentation/driver-api/serial/moxa-smartio.rst F: Documentation/driver-api/serial/moxa-smartio.rst
F: drivers/tty/mxser.* F: drivers/tty/mxser.*
@@ -15348,7 +15348,7 @@ F: scripts/selinux/
F: security/selinux/ F: security/selinux/
SENSABLE PHANTOM SENSABLE PHANTOM
M: Jiri Slaby <jirislaby@gmail.com> M: Jiri Slaby <jirislaby@kernel.org>
S: Maintained S: Maintained
F: drivers/misc/phantom.c F: drivers/misc/phantom.c
F: include/uapi/linux/phantom.h F: include/uapi/linux/phantom.h
@@ -17365,7 +17365,7 @@ K: ^Subject:.*(?i)trivial
TTY LAYER TTY LAYER
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
M: Jiri Slaby <jslaby@suse.com> M: Jiri Slaby <jirislaby@kernel.org>
S: Supported S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
F: Documentation/driver-api/serial/ F: Documentation/driver-api/serial/

4
scripts/sphinx-pre-install
View File

@@ -323,10 +323,6 @@ sub check_sphinx()
$rec_sphinx_upgrade = 1; $rec_sphinx_upgrade = 1;
return; return;
} }
if ($cur_version lt $min_pdf_version) {
$rec_sphinx_upgrade = 1;
return;
}
# On version check mode, just assume Sphinx has all mandatory deps # On version check mode, just assume Sphinx has all mandatory deps
exit (0) if ($version_check); exit (0) if ($version_check);