Merge tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bd702ad56c7f6bff4e3f9f422f5ec452d58f2b95..bfc9722a493222d45dac67c1b2c7515505cb51ae 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -932,6 +932,7 @@ M:  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Arve Hjønnevåg <arve@android.com>
 M:     Todd Kjos <tkjos@android.com>
 M:     Martijn Coenen <maco@android.com>
+M:     Joel Fernandes <joel@joelfernandes.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:     devel@driverdev.osuosl.org
 S:     Supported
@@ -4098,7 +4099,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
 S:     Supported
-F:     drivers/input/dlink-dir685-touchkeys.c
+F:     drivers/input/keyboard/dlink-dir685-touchkeys.c
 
 DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
 M:     Joshua Kinard <kumba@gentoo.org>
@@ -9567,7 +9568,7 @@ MEN Z069 WATCHDOG DRIVER
 M:     Johannes Thumshirn <jth@kernel.org>
 L:     linux-watchdog@vger.kernel.org
 S:     Maintained
-F:     drivers/watchdog/menz069_wdt.c
+F:     drivers/watchdog/menz69_wdt.c
 
 MESON AO CEC DRIVER FOR AMLOGIC SOCS
 M:     Neil Armstrong <narmstrong@baylibre.com>
@@ -13757,7 +13758,7 @@ F:      sound/soc/
 F:     include/sound/soc*
 
 SOUNDWIRE SUBSYSTEM
-M:     Vinod Koul <vinod.koul@intel.com>
+M:     Vinod Koul <vkoul@kernel.org>
 M:     Sanyog Kale <sanyog.r.kale@intel.com>
 R:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -15443,6 +15444,12 @@ F:     Documentation/driver-api/usb/typec_bus.rst
 F:     drivers/usb/typec/altmodes/
 F:     include/linux/usb/typec_altmode.h
 
+USB TYPEC PORT CONTROLLER DRIVERS
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/typec/tcpm/
+
 USB UHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
@@ -15517,13 +15524,19 @@ F:    arch/x86/um/
 F:     fs/hostfs/
 F:     fs/hppfs/
 
+USERSPACE COPYIN/COPYOUT (UIOVEC)
+M:     Alexander Viro <viro@zeniv.linux.org.uk>
+S:     Maintained
+F:     lib/iov_iter.c
+F:     include/linux/uio.h
+
 USERSPACE I/O (UIO)
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 F:     Documentation/driver-api/uio-howto.rst
 F:     drivers/uio/
-F:     include/linux/uio*.h
+F:     include/linux/uio_driver.h
 
 UTIL-LINUX PACKAGE
 M:     Karel Zak <kzak@redhat.com>