Merge tag 'timers-v5.9-rc4' of https://git.linaro.org/people/daniel.lezcano/linux...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c8e8232..1ae2625 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2867,7 +2867,7 @@ ASYMMETRIC KEYS
 M:     David Howells <dhowells@redhat.com>
 L:     keyrings@vger.kernel.org
 S:     Maintained
-F:     Documentation/crypto/asymmetric-keys.txt
+F:     Documentation/crypto/asymmetric-keys.rst
 F:     crypto/asymmetric_keys/
 F:     include/crypto/pkcs7.h
 F:     include/crypto/public_key.h
@@ -2877,7 +2877,7 @@ ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 R:     Dan Williams <dan.j.williams@intel.com>
 S:     Odd fixes
 W:     http://sourceforge.net/projects/xscaleiop
-F:     Documentation/crypto/async-tx-api.txt
+F:     Documentation/crypto/async-tx-api.rst
 F:     crypto/async_tx/
 F:     drivers/dma/
 F:     include/linux/async_tx.h
@@ -2921,7 +2921,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
@@ -7147,7 +7147,7 @@ F:        include/linux/futex.h
 F:     include/uapi/linux/futex.h
 F:     kernel/futex.c
 F:     tools/perf/bench/futex*
-F:     Documentation/locking/*futex*
+F:     tools/testing/selftests/futex/
 
 GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
 M:     Tim Harvey <tharvey@gateworks.com>
@@ -9655,7 +9655,7 @@ M:        Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
-F:     Documentation/kprobes.txt
+F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
 F:     include/linux/kprobes.h
 F:     kernel/kprobes.c
@@ -11629,7 +11629,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.*
@@ -14582,7 +14582,7 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next
 F:     Documentation/ABI/testing/sysfs-class-remoteproc
 F:     Documentation/devicetree/bindings/remoteproc/
-F:     Documentation/remoteproc.txt
+F:     Documentation/staging/remoteproc.rst
 F:     drivers/remoteproc/
 F:     include/linux/remoteproc.h
 F:     include/linux/remoteproc/
@@ -14594,7 +14594,7 @@ L:      linux-remoteproc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg-next
 F:     Documentation/ABI/testing/sysfs-bus-rpmsg
-F:     Documentation/rpmsg.txt
+F:     Documentation/staging/rpmsg.rst
 F:     drivers/rpmsg/
 F:     include/linux/rpmsg.h
 F:     include/linux/rpmsg/
@@ -15431,7 +15431,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
@@ -16846,7 +16846,7 @@ TEE SUBSYSTEM
 M:     Jens Wiklander <jens.wiklander@linaro.org>
 L:     op-tee@lists.trustedfirmware.org
 S:     Maintained
-F:     Documentation/tee.txt
+F:     Documentation/staging/tee.rst
 F:     drivers/tee/
 F:     include/linux/tee_drv.h
 F:     include/uapi/linux/tee.h
@@ -17450,7 +17450,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/