OSDN Git Service

Merge tag 'gfs2-4.21.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...
[uclinux-h8/linux.git] / MAINTAINERS
index f0f0c23..7a9804a 100644 (file)
@@ -140,7 +140,7 @@ Maintainers List (try to look for most precise areas first)
 M:     Steffen Klassert <klassert@kernel.org>
 L:     netdev@vger.kernel.org
 S:     Odd Fixes
-F:     Documentation/networking/vortex.txt
+F:     Documentation/networking/device_drivers/3com/vortex.txt
 F:     drivers/net/ethernet/3com/3c59x.c
 
 3CR990 NETWORK DRIVER
@@ -740,7 +740,7 @@ R:  Saeed Bishara <saeedb@amazon.com>
 R:     Zorik Machulsky <zorik@amazon.com>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/ena.txt
+F:     Documentation/networking/device_drivers/amazon/ena.txt
 F:     drivers/net/ethernet/amazon/
 
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
@@ -3484,6 +3484,7 @@ F:        include/linux/spi/cc2520.h
 F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 
 CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
+M:     Yael Chemla <yael.chemla@foss.arm.com>
 M:     Gilad Ben-Yossef <gilad@benyossef.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
@@ -3700,8 +3701,10 @@ W:       https://github.com/CirrusLogic/linux-drivers/wiki
 S:     Supported
 F:     Documentation/devicetree/bindings/mfd/madera.txt
 F:     Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+F:     include/linux/irqchip/irq-madera*
 F:     include/linux/mfd/madera/*
 F:     drivers/gpio/gpio-madera*
+F:     drivers/irqchip/irq-madera*
 F:     drivers/mfd/madera*
 F:     drivers/mfd/cs47l*
 F:     drivers/pinctrl/cirrus/*
@@ -4136,7 +4139,7 @@ S:        Supported
 F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
 CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
-M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+M:     Frederic Barrat <fbarrat@linux.ibm.com>
 M:     Andrew Donnellan <andrew.donnellan@au1.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
@@ -4148,9 +4151,9 @@ F:        Documentation/powerpc/cxl.txt
 F:     Documentation/ABI/testing/sysfs-class-cxl
 
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
-M:     Manoj N. Kumar <manoj@linux.vnet.ibm.com>
-M:     Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
-M:     Uma Krishnan <ukrishn@linux.vnet.ibm.com>
+M:     Manoj N. Kumar <manoj@linux.ibm.com>
+M:     Matthew R. Ochs <mrochs@linux.ibm.com>
+M:     Uma Krishnan <ukrishn@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
@@ -4222,7 +4225,7 @@ F:        net/ax25/sysctl_net_ax25.c
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:     netdev@vger.kernel.org
 S:     Orphan
-F:     Documentation/networking/dmfe.txt
+F:     Documentation/networking/device_drivers/dec/dmfe.txt
 F:     drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
@@ -5542,7 +5545,7 @@ S:        Orphan
 F:     fs/efs/
 
 EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-M:     Douglas Miller <dougmill@linux.vnet.ibm.com>
+M:     Douglas Miller <dougmill@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/ibm/ehea/
@@ -5656,6 +5659,7 @@ F:        include/linux/of_net.h
 F:     include/linux/phy.h
 F:     include/linux/phy_fixed.h
 F:     include/linux/platform_data/mdio-bcm-unimac.h
+F:     include/linux/platform_data/mdio-gpio.h
 F:     include/trace/events/mdio.h
 F:     include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
@@ -5680,7 +5684,7 @@ F:        Documentation/filesystems/ext4/ext4.rst
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 F:     security/integrity/evm/
@@ -5890,7 +5894,7 @@ F:        include/linux/firmware.h
 
 FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
 M:     Joshua Morris <josh.h.morris@us.ibm.com>
-M:     Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+M:     Philip Kelleher <pjk1939@linux.ibm.com>
 S:     Maintained
 F:     drivers/block/rsxx/
 
@@ -6157,7 +6161,7 @@ F:        include/linux/fscrypt*.h
 F:     Documentation/filesystems/fscrypt.rst
 
 FSI-ATTACHED I2C DRIVER
-M:     Eddie James <eajames@linux.vnet.ibm.com>
+M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-i2c@vger.kernel.org
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
@@ -6333,8 +6337,7 @@ S:        Supported
 F:     drivers/uio/uio_pci_generic.c
 
 GENWQE (IBM Generic Workqueue Card)
-M:     Frank Haverkamp <haver@linux.vnet.ibm.com>
-M:     Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
+M:     Frank Haverkamp <haver@linux.ibm.com>
 S:     Supported
 F:     drivers/misc/genwqe/
 
@@ -6948,7 +6951,7 @@ M:        Sasha Levin <sashal@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 L:     devel@linuxdriverproject.org
 S:     Supported
-F:     Documentation/networking/netvsc.txt
+F:     Documentation/networking/device_drivers/microsoft/netvsc.txt
 F:     arch/x86/include/asm/mshyperv.h
 F:     arch/x86/include/asm/trace/hyperv.h
 F:     arch/x86/include/asm/hyperv-tlfs.h
@@ -7145,8 +7148,9 @@ F:        crypto/842.c
 F:     lib/842/
 
 IBM Power in-Nest Crypto Acceleration
-M:     Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+M:     Breno Leitão <leitao@debian.org>
+M:     Nayna Jain <nayna@linux.ibm.com>
+M:     Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/nx/Makefile
@@ -7163,8 +7167,8 @@ S:        Supported
 F:     drivers/scsi/ipr.*
 
 IBM Power SRIOV Virtual NIC Device Driver
-M:     Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
-M:     John Allen <jallen@linux.vnet.ibm.com>
+M:     Thomas Falcon <tlfalcon@linux.ibm.com>
+M:     John Allen <jallen@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
@@ -7179,41 +7183,40 @@ F:      arch/powerpc/include/asm/vas.h
 F:     arch/powerpc/include/uapi/asm/vas.h
 
 IBM Power Virtual Ethernet Device Driver
-M:     Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+M:     Thomas Falcon <tlfalcon@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual FC Device Drivers
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM Power Virtual Management Channel Driver
-M:     Bryant G. Ly <bryantly@linux.vnet.ibm.com>
-M:     Steven Royer <seroyer@linux.vnet.ibm.com>
+M:     Steven Royer <seroyer@linux.ibm.com>
 S:     Supported
 F:     drivers/misc/ibmvmc.*
 
 IBM Power Virtual SCSI Device Drivers
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvscsi*
 F:     include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M:     Bryant G. Ly <bryantly@linux.vnet.ibm.com>
-M:     Michael Cyr <mikecyr@linux.vnet.ibm.com>
+M:     Michael Cyr <mikecyr@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 L:     target-devel@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi_tgt/
 
 IBM Power VMX Cryptographic instructions
-M:     Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+M:     Breno Leitão <leitao@debian.org>
+M:     Nayna Jain <nayna@linux.ibm.com>
+M:     Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/vmx/Makefile
@@ -7490,7 +7493,7 @@ S:        Maintained
 L:     linux-crypto@vger.kernel.org
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 L:     linux-integrity@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@ -7550,18 +7553,18 @@ Q:      http://patchwork.ozlabs.org/project/intel-wired-lan/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 S:     Supported
-F:     Documentation/networking/e100.rst
-F:     Documentation/networking/e1000.rst
-F:     Documentation/networking/e1000e.rst
-F:     Documentation/networking/fm10k.rst
-F:     Documentation/networking/igb.rst
-F:     Documentation/networking/igbvf.rst
-F:     Documentation/networking/ixgb.rst
-F:     Documentation/networking/ixgbe.rst
-F:     Documentation/networking/ixgbevf.rst
-F:     Documentation/networking/i40e.rst
-F:     Documentation/networking/iavf.rst
-F:     Documentation/networking/ice.rst
+F:     Documentation/networking/device_drivers/intel/e100.rst
+F:     Documentation/networking/device_drivers/intel/e1000.rst
+F:     Documentation/networking/device_drivers/intel/e1000e.rst
+F:     Documentation/networking/device_drivers/intel/fm10k.rst
+F:     Documentation/networking/device_drivers/intel/igb.rst
+F:     Documentation/networking/device_drivers/intel/igbvf.rst
+F:     Documentation/networking/device_drivers/intel/ixgb.rst
+F:     Documentation/networking/device_drivers/intel/ixgbe.rst
+F:     Documentation/networking/device_drivers/intel/ixgbevf.rst
+F:     Documentation/networking/device_drivers/intel/i40e.rst
+F:     Documentation/networking/device_drivers/intel/iavf.rst
+F:     Documentation/networking/device_drivers/intel/ice.rst
 F:     drivers/net/ethernet/intel/
 F:     drivers/net/ethernet/intel/*/
 F:     include/linux/avf/virtchnl.h
@@ -7743,8 +7746,8 @@ INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <stas.yakovlev@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     Documentation/networking/README.ipw2100
-F:     Documentation/networking/README.ipw2200
+F:     Documentation/networking/device_drivers/intel/ipw2100.txt
+F:     Documentation/networking/device_drivers/intel/ipw2200.txt
 F:     drivers/net/wireless/intel/ipw2x00/
 
 INTEL PSTATE DRIVER
@@ -8004,13 +8007,6 @@ F:       include/linux/isdn/
 F:     include/uapi/linux/isdn.h
 F:     include/uapi/linux/isdn/
 
-ISDN SUBSYSTEM (Eicon active card driver)
-M:     Armin Schindler <mac@melware.de>
-L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
-W:     http://www.melware.de
-S:     Maintained
-F:     drivers/isdn/hardware/eicon/
-
 IT87 HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-hwmon@vger.kernel.org
@@ -8099,9 +8095,8 @@ S:        Maintained
 F:     drivers/media/platform/rcar_jpu.c
 
 JSM Neo PCI based serial card
-M:     Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
@@ -8307,6 +8302,7 @@ W:        http://www.linux-kvm.org
 T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 S:     Supported
 F:     arch/x86/kvm/
+F:     arch/x86/kvm/*/
 F:     arch/x86/include/uapi/asm/kvm*
 F:     arch/x86/include/asm/kvm*
 F:     arch/x86/include/asm/pvclock-abi.h
@@ -8331,7 +8327,7 @@ F:        include/uapi/linux/kexec.h
 F:     kernel/kexec*
 
 KEYS-ENCRYPTED
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
@@ -8340,9 +8336,9 @@ F:        include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
-M:     James Bottomley <jejb@linux.vnet.ibm.com>
+M:     James Bottomley <jejb@linux.ibm.com>
 M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linuxibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
@@ -8395,7 +8391,7 @@ F:        lib/test_kmod.c
 F:     tools/testing/selftests/kmod/
 
 KPROBES
-M:     Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+M:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 M:     Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
@@ -8751,7 +8747,7 @@ M:        Nicholas Piggin <npiggin@gmail.com>
 M:     David Howells <dhowells@redhat.com>
 M:     Jade Alglave <j.alglave@ucl.ac.uk>
 M:     Luc Maranget <luc.maranget@inria.fr>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 R:     Akira Yokosawa <akiyks@gmail.com>
 R:     Daniel Lustig <dlustig@nvidia.com>
 L:     linux-kernel@vger.kernel.org
@@ -9716,7 +9712,7 @@ F:        drivers/platform/x86/mlx-platform.c
 
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/sched/membarrier.c
@@ -9997,6 +9993,7 @@ F:        Documentation/scsi/smartpqi.txt
 
 MICROSEMI ETHERNET SWITCH DRIVER
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/mscc/
@@ -10408,8 +10405,8 @@ NETERION 10GbE DRIVERS (s2io/vxge)
 M:     Jon Mason <jdmason@kudzu.us>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/s2io.txt
-F:     Documentation/networking/vxge.txt
+F:     Documentation/networking/device_drivers/neterion/s2io.txt
+F:     Documentation/networking/device_drivers/neterion/vxge.txt
 F:     drivers/net/ethernet/neterion/
 
 NETFILTER
@@ -10851,6 +10848,14 @@ L:     linux-nfc@lists.01.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/nfc/nxp-nci
 
+OBJAGG
+M:     Jiri Pirko <jiri@mellanox.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     lib/objagg.c
+F:     lib/test_objagg.c
+F:     include/linux/objagg.h
+
 OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>
@@ -10858,7 +10863,7 @@ S:      Supported
 F:     tools/objtool/
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
-M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+M:     Frederic Barrat <fbarrat@linux.ibm.com>
 M:     Andrew Donnellan <andrew.donnellan@au1.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
@@ -12414,7 +12419,7 @@ QLOGIC QLA3XXX NETWORK DRIVER
 M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/LICENSE.qla3xxx
+F:     Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
 F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLA4XXX iSCSI DRIVER
@@ -12466,7 +12471,7 @@ L:      linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/bus/fsl-mc/
 F:     Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
-F:     Documentation/networking/dpaa2/overview.rst
+F:     Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
 
 QT1010 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
@@ -12672,7 +12677,7 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE TEST FRAMEWORK
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -12714,16 +12719,17 @@ M:    Fenghua Yu <fenghua.yu@intel.com>
 M:     Reinette Chatre <reinette.chatre@intel.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
-F:     arch/x86/kernel/cpu/intel_rdt*
-F:     arch/x86/include/asm/intel_rdt_sched.h
-F:     Documentation/x86/intel_rdt*
+F:     arch/x86/kernel/cpu/resctrl/
+F:     arch/x86/include/asm/resctrl_sched.h
+F:     Documentation/x86/resctrl*
 
 READ-COPY UPDATE (RCU)
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 R:     Lai Jiangshan <jiangshanlai@gmail.com>
+R:     Joel Fernandes <joel@joelfernandes.org>
 L:     linux-kernel@vger.kernel.org
 W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
@@ -12859,7 +12865,7 @@ F:      include/linux/reset-controller.h
 RESTARTABLE SEQUENCES SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 M:     Peter Zijlstra <peterz@infradead.org>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Boqun Feng <boqun.feng@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -13391,7 +13397,7 @@ F:      drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
+M:     "James E.J. Bottomley" <jejb@linux.ibm.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 M:     "Martin K. Petersen" <martin.petersen@oracle.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@ -13832,7 +13838,7 @@ F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <jiangshanlai@gmail.com>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -14227,7 +14233,7 @@ SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/spider_net.txt
+F:     Documentation/networking/device_drivers/toshiba/spider_net.txt
 F:     drivers/net/ethernet/toshiba/spider_net*
 
 SPMI SUBSYSTEM
@@ -15223,7 +15229,7 @@ M:      Samuel Chessman <chessman@tux.org>
 L:     tlan-devel@lists.sourceforge.net (subscribers-only)
 W:     http://sourceforge.net/projects/tlan/
 S:     Maintained
-F:     Documentation/networking/tlan.txt
+F:     Documentation/networking/device_drivers/ti/tlan.txt
 F:     drivers/net/ethernet/ti/tlan.*
 
 TM6000 VIDEO4LINUX DRIVER
@@ -15277,7 +15283,7 @@ F:      drivers/platform/x86/topstar-laptop.c
 
 TORTURE-TEST MODULES
 M:     Davidlohr Bueso <dave@stgolabs.net>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -16588,6 +16594,7 @@ L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
 S:     Supported
 F:     arch/x86/xen/
+F:     arch/x86/platform/pvh/
 F:     drivers/*/xen-*front.c
 F:     drivers/xen/
 F:     arch/x86/include/asm/xen/