net: macb: NULL out phydev after removing mdio bus
[cascardo/linux.git] / MAINTAINERS
index bbfe20c..274d2a0 100644 (file)
@@ -636,6 +636,15 @@ F: drivers/tty/serial/altera_jtaguart.c
 F:     include/linux/altera_uart.h
 F:     include/linux/altera_jtaguart.h
 
+AMAZON ETHERNET DRIVERS
+M:     Netanel Belgazal <netanel@annapurnalabs.com>
+R:     Saeed Bishara <saeed@annapurnalabs.com>
+R:     Zorik Machulsky <zorik@annapurnalabs.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/networking/ena.txt
+F:     drivers/net/ethernet/amazon/
+
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 M:     Gary Hook <gary.hook@amd.com>
@@ -810,11 +819,11 @@ L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/aoa/
 
-APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
+APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     drivers/iio/dac/stx104.c
+F:     drivers/iio/adc/stx104.c
 
 APM DRIVER
 M:     Jiri Kosina <jikos@kernel.org>
@@ -1847,6 +1856,7 @@ F:        arch/arm/mach-uniphier/
 F:     arch/arm/mm/cache-uniphier.c
 F:     arch/arm64/boot/dts/socionext/
 F:     drivers/bus/uniphier-system-bus.c
+F:     drivers/clk/uniphier/
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/pinctrl/uniphier/
 F:     drivers/tty/serial/8250/8250_uniphier.c
@@ -1983,6 +1993,13 @@ S:       Maintained
 F:     drivers/media/i2c/as3645a.c
 F:     include/media/i2c/as3645a.h
 
+ASAHI KASEI AK8974 DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-iio@vger.kernel.org
+W:     http://www.akm.com/
+S:     Supported
+F:     drivers/iio/magnetometer/ak8974.c
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:     George Joseph <george.joseph@fairview5.com>
 L:     linux-hwmon@vger.kernel.org
@@ -2121,11 +2138,6 @@ M:       Ludovic Desroches <ludovic.desroches@atmel.com>
 S:     Maintained
 F:     drivers/mmc/host/atmel-mci.c
 
-ATMEL AT91 / AT32 SERIAL DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
-S:     Supported
-F:     drivers/tty/serial/atmel_serial.c
-
 ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
@@ -3143,7 +3155,7 @@ L:        cocci@systeme.lip6.fr (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
 W:     http://coccinelle.lip6.fr/
 S:     Supported
-F:     Documentation/coccinelle.txt
+F:     Documentation/dev-tools/coccinelle.rst
 F:     scripts/coccinelle/
 F:     scripts/coccicheck
 
@@ -3169,6 +3181,7 @@ COMMON CLK FRAMEWORK
 M:     Michael Turquette <mturquette@baylibre.com>
 M:     Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-clk@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-clk/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/
@@ -3788,6 +3801,12 @@ F:       include/linux/regulator/da9211.h
 F:     include/sound/da[79]*.h
 F:     sound/soc/codecs/da[79]*.[ch]
 
+DIAMOND SYSTEMS GPIO-MM GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-gpio-mm.c
+
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:     Lidza Louina <lidza.louina@gmail.com>
 M:     Mark Hounschell <markh@compro.net>
@@ -4413,7 +4432,6 @@ F:        Documentation/filesystems/ecryptfs.txt
 F:     fs/ecryptfs/
 
 EDAC-CORE
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4426,14 +4444,12 @@ F:      drivers/edac/
 F:     include/linux/edac.h
 
 EDAC-AMD64
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
 EDAC-CALXEDA
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
@@ -4449,17 +4465,21 @@ F:      drivers/edac/octeon_edac*
 
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
 
 EDAC-E7XXX
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
 
+EDAC-FSL_DDR
+M:     York Sun <york.sun@nxp.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/fsl_ddr_edac.*
+
 EDAC-GHES
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4474,13 +4494,11 @@ S:      Maintained
 F:     drivers/edac/i82443bxgx_edac.c
 
 EDAC-I3000
-M:     Jason Uhlenkott <juhlenko@akamai.com>
 L:     linux-edac@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/edac/i3000_edac.c
 
 EDAC-I5000
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -4866,6 +4884,7 @@ F:        tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
 M:     Ming Lei <ming.lei@canonical.com>
+M:     Luis R. Rodriguez <mcgrof@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/firmware_class/
@@ -4986,6 +5005,13 @@ F:       drivers/net/ethernet/freescale/fec_ptp.c
 F:     drivers/net/ethernet/freescale/fec.h
 F:     Documentation/devicetree/bindings/net/fsl-fec.txt
 
+FREESCALE QORIQ DPAA FMAN DRIVER
+M:     Madalin Bucur <madalin.bucur@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/fman
+F:     Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+
 FREESCALE QUICC ENGINE LIBRARY
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Orphan
@@ -5086,10 +5112,9 @@ F:       include/linux/fscrypto.h
 
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
-M:     Changman Lee <cm224.lee@samsung.com>
-R:     Chao Yu <yuchao0@huawei.com>
+M:     Chao Yu <yuchao0@huawei.com>
 L:     linux-f2fs-devel@lists.sourceforge.net
-W:     http://en.wikipedia.org/wiki/F2FS
+W:     https://f2fs.wiki.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:     Maintained
 F:     Documentation/filesystems/f2fs.txt
@@ -5151,7 +5176,7 @@ GCOV BASED KERNEL PROFILING
 M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 S:     Maintained
 F:     kernel/gcov/
-F:     Documentation/gcov.txt
+F:     Documentation/dev-tools/gcov.rst
 
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
 M:     Achim Leubner <achim_leubner@adaptec.com>
@@ -5268,6 +5293,13 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/goodix.c
 
+GPIO MOCKUP DRIVER
+M:     Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-mockup.c
+F:     tools/testing/selftests/gpio/
+
 GPIO SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 M:     Alexandre Courbot <gnurou@gmail.com>
@@ -5299,6 +5331,77 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/aeroflex/
 
+GREYBUS SUBSYSTEM
+M:     Johan Hovold <johan@kernel.org>
+M:     Alex Elder <elder@kernel.org>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:     Maintained
+F:     drivers/staging/greybus/
+
+GREYBUS AUDIO PROTOCOLS DRIVERS
+M:     Vaibhav Agarwal <vaibhav.sr@gmail.com>
+M:     Mark Greer <mgreer@animalcreek.com>
+S:     Maintained
+F:     drivers/staging/greybus/audio_apbridgea.c
+F:     drivers/staging/greybus/audio_apbridgea.h
+F:     drivers/staging/greybus/audio_codec.c
+F:     drivers/staging/greybus/audio_codec.h
+F:     drivers/staging/greybus/audio_gb.c
+F:     drivers/staging/greybus/audio_manager.c
+F:     drivers/staging/greybus/audio_manager.h
+F:     drivers/staging/greybus/audio_manager_module.c
+F:     drivers/staging/greybus/audio_manager_private.h
+F:     drivers/staging/greybus/audio_manager_sysfs.c
+F:     drivers/staging/greybus/audio_module.c
+F:     drivers/staging/greybus/audio_topology.c
+
+GREYBUS PROTOCOLS DRIVERS
+M:     Rui Miguel Silva <rmfrfs@gmail.com>
+S:     Maintained
+F:     drivers/staging/greybus/sdio.c
+F:     drivers/staging/greybus/light.c
+F:     drivers/staging/greybus/gpio.c
+F:     drivers/staging/greybus/power_supply.c
+F:     drivers/staging/greybus/spi.c
+F:     drivers/staging/greybus/spilib.c
+
+GREYBUS PROTOCOLS DRIVERS
+M:     Bryan O'Donoghue <pure.logic@nexus-software.ie>
+S:     Maintained
+F:     drivers/staging/greybus/loopback.c
+F:     drivers/staging/greybus/timesync.c
+F:     drivers/staging/greybus/timesync_platform.c
+
+GREYBUS PROTOCOLS DRIVERS
+M:     Viresh Kumar <vireshk@kernel.org>
+S:     Maintained
+F:     drivers/staging/greybus/authentication.c
+F:     drivers/staging/greybus/bootrom.c
+F:     drivers/staging/greybus/firmware.h
+F:     drivers/staging/greybus/fw-core.c
+F:     drivers/staging/greybus/fw-download.c
+F:     drivers/staging/greybus/fw-managament.c
+F:     drivers/staging/greybus/greybus_authentication.h
+F:     drivers/staging/greybus/greybus_firmware.h
+F:     drivers/staging/greybus/hid.c
+F:     drivers/staging/greybus/i2c.c
+F:     drivers/staging/greybus/spi.c
+F:     drivers/staging/greybus/spilib.c
+F:     drivers/staging/greybus/spilib.h
+
+GREYBUS PROTOCOLS DRIVERS
+M:     David Lin <dtwlin@gmail.com>
+S:     Maintained
+F:     drivers/staging/greybus/uart.c
+F:     drivers/staging/greybus/log.c
+
+GREYBUS PLATFORM DRIVERS
+M:     Vaibhav Hiremath <hvaibhav.linux@gmail.com>
+S:     Maintained
+F:     drivers/staging/greybus/arche-platform.c
+F:     drivers/staging/greybus/arche-apb-ctrl.c
+F:     drivers/staging/greybus/arche_platform.h
+
 GSPCA FINEPIX SUBDRIVER
 M:     Frank Zago <frank@zago.net>
 L:     linux-media@vger.kernel.org
@@ -5599,10 +5702,9 @@ F:       Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
-L:     hostap@shmoo.com (subscribers-only)
 L:     linux-wireless@vger.kernel.org
-W:     http://hostap.epitest.fi/
-S:     Maintained
+W:     http://w1.fi/hostap-driver.html
+S:     Obsolete
 F:     drivers/net/wireless/intersil/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
@@ -5639,7 +5741,7 @@ M:        Sebastian Reichel <sre@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-hsi
-F:     Documentation/hsi.txt
+F:     Documentation/device-drivers/serial-interfaces.rst
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -6620,7 +6722,7 @@ L:        kasan-dev@googlegroups.com
 S:     Maintained
 F:     arch/*/include/asm/kasan.h
 F:     arch/*/mm/kasan_init*
-F:     Documentation/kasan.txt
+F:     Documentation/dev-tools/kasan.rst
 F:     include/linux/kasan*.h
 F:     lib/test_kasan.c
 F:     mm/kasan/
@@ -6836,7 +6938,7 @@ KMEMCHECK
 M:     Vegard Nossum <vegardno@ifi.uio.no>
 M:     Pekka Enberg <penberg@kernel.org>
 S:     Maintained
-F:     Documentation/kmemcheck.txt
+F:     Documentation/dev-tools/kmemcheck.rst
 F:     arch/x86/include/asm/kmemcheck.h
 F:     arch/x86/mm/kmemcheck/
 F:     include/linux/kmemcheck.h
@@ -6845,7 +6947,7 @@ F:        mm/kmemcheck.c
 KMEMLEAK
 M:     Catalin Marinas <catalin.marinas@arm.com>
 S:     Maintained
-F:     Documentation/kmemleak.txt
+F:     Documentation/dev-tools/kmemleak.rst
 F:     include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     mm/kmemleak-test.c
@@ -7458,9 +7560,8 @@ F:        Documentation/hwmon/max20751
 F:     drivers/hwmon/max20751.c
 
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
-M:     "Hans J. Koch" <hjk@hansjkoch.de>
 L:     linux-hwmon@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     Documentation/hwmon/max6650
 F:     drivers/hwmon/max6650.c
 
@@ -7531,6 +7632,12 @@ L:       linux-iio@vger.kernel.org
 S:     Maintained
 F:     drivers/iio/potentiometer/mcp4531.c
 
+MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/dac/cio-dac.c
+
 MEDIA DRIVERS FOR RENESAS - FCP
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -7683,6 +7790,13 @@ W:       http://www.mellanox.com
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
+MELLANOX MLXCPLD LED DRIVER
+M:     Vadim Pasternak <vadimp@mellanox.com>
+L:     linux-leds@vger.kernel.org
+S:     Supported
+F:     drivers/leds/leds-mlxcpld.c
+F:     Documentation/leds/leds-mlxcpld.txt
+
 MELLANOX PLATFORM DRIVER
 M:      Vadim Pasternak <vadimp@mellanox.com>
 L:      platform-driver-x86@vger.kernel.org
@@ -7774,6 +7888,12 @@ T:       git git://git.monstr.eu/linux-2.6-microblaze.git
 S:     Supported
 F:     arch/microblaze/
 
+MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
+M:     Richard Genoud <richard.genoud@gmail.com>
+S:     Maintained
+F:     drivers/tty/serial/atmel_serial.c
+F:     include/linux/atmel_serial.h
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:     Chen Yu <yu.c.chen@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -9722,6 +9842,12 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:     Supported
 F:     drivers/net/wireless/ath/ath10k/
 
+QUALCOMM EMAC GIGABIT ETHERNET DRIVER
+M:     Timur Tabi <timur@codeaurora.org>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/qualcomm/emac/
+
 QUALCOMM HEXAGON ARCHITECTURE
 M:     Richard Kuo <rkuo@codeaurora.org>
 L:     linux-hexagon@vger.kernel.org
@@ -9942,6 +10068,12 @@ F:      drivers/rpmsg/
 F:     Documentation/rpmsg.txt
 F:     include/linux/rpmsg.h
 
+RENESAS CLOCK DRIVERS
+M:     Geert Uytterhoeven <geert+renesas@glider.be>
+L:     linux-renesas-soc@vger.kernel.org
+S:     Supported
+F:     drivers/clk/renesas/
+
 RENESAS ETHERNET DRIVERS
 R:     Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 L:     netdev@vger.kernel.org
@@ -9977,6 +10109,7 @@ F:       net/rfkill/
 
 RHASHTABLE
 M:     Thomas Graf <tgraf@suug.ch>
+M:     Herbert Xu <herbert@gondor.apana.org.au>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     lib/rhashtable.c
@@ -10120,8 +10253,8 @@ S:      Supported
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
-M:     Stefan Weinhuber <wein@de.ibm.com>
-M:     Stefan Haberland <stefan.haberland@de.ibm.com>
+M:     Stefan Haberland <sth@linux.vnet.ibm.com>
+M:     Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -10285,9 +10418,12 @@ F:     drivers/nfc/s3fwrn5
 SAMSUNG SOC CLOCK DRIVERS
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 M:     Tomasz Figa <tomasz.figa@gmail.com>
+M:     Chanwoo Choi <cw00.choi@samsung.com>
 S:     Supported
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 F:     drivers/clk/samsung/
+F:     include/dt-bindings/clock/exynos*.h
+F:     Documentation/devicetree/bindings/clock/exynos*.txt
 
 SAMSUNG SPI DRIVERS
 M:     Kukjin Kim <kgene@kernel.org>
@@ -11146,6 +11282,7 @@ F:      Documentation/spi/
 F:     drivers/spi/
 F:     include/linux/spi/
 F:     include/uapi/linux/spi/
+F:     tools/spi/
 
 SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
@@ -11216,6 +11353,7 @@ F:      drivers/staging/media/lirc/
 STAGING - LUSTRE PARALLEL FILESYSTEM
 M:     Oleg Drokin <oleg.drokin@intel.com>
 M:     Andreas Dilger <andreas.dilger@intel.com>
+M:     James Simmons <jsimmons@infradead.org>
 L:     lustre-devel@lists.lustre.org (moderated for non-subscribers)
 W:     http://wiki.lustre.org/
 S:     Maintained
@@ -11242,13 +11380,6 @@ M:     Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:     Odd Fixes
 F:     drivers/staging/rtl8712/
 
-STAGING - REALTEK RTL8723U WIRELESS DRIVER
-M:     Larry Finger <Larry.Finger@lwfinger.net>
-M:     Jes Sorensen <Jes.Sorensen@redhat.com>
-L:     linux-wireless@vger.kernel.org
-S:     Maintained
-F:     drivers/staging/rtl8723au/
-
 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:     Teddy Wang <teddy.wang@siliconmotion.com>
@@ -12215,7 +12346,7 @@ S:      Maintained
 F:     drivers/net/usb/lan78xx.*
 
 USB MASS STORAGE DRIVER
-M:     Matthew Dharm <mdharm-usb@one-eyed-alien.net>
+M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 L:     usb-storage@lists.one-eyed-alien.net
 S:     Maintained
@@ -12299,6 +12430,7 @@ F:      drivers/net/usb/rtl8150.c
 USB SERIAL SUBSYSTEM
 M:     Johan Hovold <johan@kernel.org>
 L:     linux-usb@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
 S:     Maintained
 F:     Documentation/usb/usb-serial.txt
 F:     drivers/usb/serial/
@@ -12312,6 +12444,7 @@ F:      drivers/net/usb/smsc75xx.*
 
 USB SMSC95XX ETHERNET DRIVER
 M:     Steve Glendinning <steve.glendinning@shawell.net>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
@@ -12418,7 +12551,6 @@ F:      fs/hostfs/
 F:     fs/hppfs/
 
 USERSPACE I/O (UIO)
-M:     "Hans J. Koch" <hjk@hansjkoch.de>
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
@@ -12936,6 +13068,7 @@ F:      arch/arm64/include/asm/xen/
 
 XEN NETWORK BACKEND DRIVER
 M:     Wei Liu <wei.liu2@citrix.com>
+M:     Paul Durrant <paul.durrant@citrix.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -12973,11 +13106,10 @@ F:    arch/x86/xen/*swiotlb*
 F:     drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
-P:     Silicon Graphics Inc
 M:     Dave Chinner <david@fromorbit.com>
-M:     xfs@oss.sgi.com
-L:     xfs@oss.sgi.com
-W:     http://oss.sgi.com/projects/xfs
+M:     linux-xfs@vger.kernel.org
+L:     linux-xfs@vger.kernel.org
+W:     http://xfs.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
 S:     Supported
 F:     Documentation/filesystems/xfs.txt