Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[sfrench/cifs-2.6.git] / MAINTAINERS
index 835048e62435332b3d51216dde846485389457c5..7e9c887ad951215464705d112377e4e2266a9d76 100644 (file)
@@ -527,11 +527,6 @@ W: http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/input/misc/adxl34x.c
 
-AEDSP16 DRIVER
-M:     Riccardo Facchetti <fizban@tin.it>
-S:     Maintained
-F:     sound/oss/aedsp16.c
-
 AF9013 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -873,7 +868,7 @@ F:  drivers/android/
 F:     drivers/staging/android/
 
 ANDROID GOLDFISH RTC DRIVER
-M:     Miodrag Dinic <miodrag.dinic@imgtec.com>
+M:     Miodrag Dinic <miodrag.dinic@mips.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
 F:     drivers/rtc/rtc-goldfish.c
@@ -2029,6 +2024,7 @@ M:        Masahiro Yamada <yamada.masahiro@socionext.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/include/asm/hardware/cache-uniphier.h
 F:     arch/arm/mach-uniphier/
@@ -2036,6 +2032,7 @@ 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/gpio/gpio-uniphier.c
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/irqchip/irq-uniphier-aidet.c
 F:     drivers/pinctrl/uniphier/
@@ -2247,7 +2244,7 @@ F:        include/linux/dmaengine.h
 F:     include/linux/async_tx.h
 
 AT24 EEPROM DRIVER
-M:     Wolfram Sang <wsa@the-dreams.de>
+M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/misc/eeprom/at24.c
@@ -2562,10 +2559,12 @@ S:      Maintained
 F:     drivers/net/hamradio/baycom*
 
 BCACHE (BLOCK LAYER CACHE)
+M:     Michael Lyle <mlyle@lyle.org>
 M:     Kent Overstreet <kent.overstreet@gmail.com>
 L:     linux-bcache@vger.kernel.org
 W:     http://bcache.evilpiepirate.org
-S:     Orphan
+C:     irc://irc.oftc.net/bcache
+S:     Maintained
 F:     drivers/md/bcache/
 
 BDISP ST MEDIA DRIVER
@@ -2896,6 +2895,13 @@ S:       Supported
 F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
+M:     Al Cooper <alcooperx@gmail.com>
+L:     linux-kernel@vger.kernel.org
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     drivers/phy/broadcom/phy-brcm-usb*
+
 BROADCOM GENET ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
@@ -3444,7 +3450,8 @@ M:        Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Supported
-F:     drivers/clocksource
+F:     drivers/clocksource/
+F:     Documentation/devicetree/bindings/timer/
 
 CMPC ACPI DRIVER
 M:     Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
@@ -3465,7 +3472,7 @@ COCCINELLE/Semantic Patches (SmPL)
 M:     Julia Lawall <Julia.Lawall@lip6.fr>
 M:     Gilles Muller <Gilles.Muller@lip6.fr>
 M:     Nicolas Palix <nicolas.palix@imag.fr>
-M:     Michal Marek <mmarek@suse.com>
+M:     Michal Marek <michal.lkml@markovi.net>
 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/
@@ -3636,6 +3643,8 @@ F:        drivers/cpufreq/arm_big_little_dt.c
 
 CPU POWER MONITORING SUBSYSTEM
 M:     Thomas Renninger <trenn@suse.com>
+M:     Shuah Khan <shuahkh@osg.samsung.com>
+M:     Shuah Khan <shuah@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     tools/power/cpupower/
@@ -4091,6 +4100,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 T:     quilt http://people.redhat.com/agk/patches/linux/editing/
 S:     Maintained
 F:     Documentation/device-mapper/
+F:     drivers/md/Makefile
+F:     drivers/md/Kconfig
 F:     drivers/md/dm*
 F:     drivers/md/persistent-data/
 F:     include/linux/device-mapper.h
@@ -4234,7 +4245,7 @@ S:        Maintained
 F:     drivers/dma/
 F:     include/linux/dmaengine.h
 F:     Documentation/devicetree/bindings/dma/
-F:     Documentation/dmaengine/
+F:     Documentation/driver-api/dmaengine/
 T:     git git://git.infradead.org/users/vkoul/slave-dma.git
 
 DMA MAPPING HELPERS
@@ -4906,13 +4917,19 @@ L:      linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/highbank*
 
-EDAC-CAVIUM
+EDAC-CAVIUM OCTEON
 M:     Ralf Baechle <ralf@linux-mips.org>
 M:     David Daney <david.daney@cavium.com>
 L:     linux-edac@vger.kernel.org
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     drivers/edac/octeon_edac*
+
+EDAC-CAVIUM THUNDERX
+M:     David Daney <david.daney@cavium.com>
+M:     Jan Glauber <jglauber@cavium.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
 F:     drivers/edac/thunderx_edac*
 
 EDAC-CORE
@@ -5213,8 +5230,7 @@ F:        fs/ext4/
 
 Extended Verification Module (EVM)
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
-L:     linux-ima-devel@lists.sourceforge.net
-L:     linux-security-module@vger.kernel.org
+L:     linux-integrity@vger.kernel.org
 S:     Supported
 F:     security/integrity/evm/
 
@@ -5259,7 +5275,8 @@ S:        Maintained
 F:     drivers/iommu/exynos-iommu.c
 
 EZchip NPS platform support
-M:     Noam Camus <noamc@ezchip.com>
+M:     Elad Kanfi <eladkan@mellanox.com>
+M:     Vineet Gupta <vgupta@synopsys.com>
 S:     Supported
 F:     arch/arc/plat-eznps
 F:     arch/arc/boot/dts/eznps.dts
@@ -5345,9 +5362,7 @@ M:        "J. Bruce Fields" <bfields@fieldses.org>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     include/linux/fcntl.h
-F:     include/linux/fs.h
 F:     include/uapi/linux/fcntl.h
-F:     include/uapi/linux/fs.h
 F:     fs/fcntl.c
 F:     fs/locks.c
 
@@ -5356,6 +5371,8 @@ M:        Alexander Viro <viro@zeniv.linux.org.uk>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/*
+F:     include/linux/fs.h
+F:     include/uapi/linux/fs.h
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:     Riku Voipio <riku.voipio@iki.fi>
@@ -5468,7 +5485,7 @@ F:        include/uapi/linux/fb.h
 
 FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
 M:     Horia Geantă <horia.geanta@nxp.com>
-M:     Dan Douglass <dan.douglass@nxp.com>
+M:     Aymen Sghaier <aymen.sghaier@nxp.com>
 L:     linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/caam/
@@ -5648,6 +5665,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
 S:     Supported
 F:     fs/crypto/
 F:     include/linux/fscrypt*.h
+F:     Documentation/filesystems/fscrypt.rst
 
 FUJITSU FR-V (FRV) PORT
 S:     Orphan
@@ -6677,7 +6695,7 @@ F:        include/net/ieee802154_netdev.h
 F:     Documentation/networking/ieee802154.txt
 
 IFE PROTOCOL
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     Yotam Gigi <yotam.gi@gmail.com>
 M:     Jamal Hadi Salim <jhs@mojatatu.com>
 F:     net/ife
 F:     include/net/ife.h
@@ -6739,13 +6757,13 @@ S:      Maintained
 F:     drivers/usb/atm/ueagle-atm.c
 
 IMGTEC ASCII LCD DRIVER
-M:     Paul Burton <paul.burton@imgtec.com>
+M:     Paul Burton <paul.burton@mips.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
 F:     drivers/auxdisplay/img-ascii-lcd.c
 
 IMGTEC IR DECODER DRIVER
-M:     James Hogan <james.hogan@imgtec.com>
+M:     James Hogan <jhogan@kernel.org>
 S:     Maintained
 F:     drivers/media/rc/img-ir/
 
@@ -6847,9 +6865,7 @@ L:        linux-crypto@vger.kernel.org
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
-L:     linux-ima-devel@lists.sourceforge.net
-L:     linux-ima-user@lists.sourceforge.net
-L:     linux-security-module@vger.kernel.org
+L:     linux-integrity@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
 S:     Supported
 F:     security/integrity/ima/
@@ -7439,10 +7455,8 @@ F:       mm/kasan/
 F:     scripts/Makefile.kasan
 
 KCONFIG
-M:     "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:     linux-kbuild@vger.kernel.org
-T:     git git://gitorious.org/linux-kconfig/linux-kconfig
-S:     Maintained
+S:     Orphan
 F:     Documentation/kbuild/kconfig-language.txt
 F:     scripts/kconfig/
 
@@ -7471,7 +7485,7 @@ F:        fs/autofs4/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:     Masahiro Yamada <yamada.masahiro@socionext.com>
-M:     Michal Marek <mmarek@suse.com>
+M:     Michal Marek <michal.lkml@markovi.net>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
@@ -7569,7 +7583,7 @@ F:        arch/arm64/include/asm/kvm*
 F:     arch/arm64/kvm/
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
-M:     James Hogan <james.hogan@imgtec.com>
+M:     James Hogan <jhogan@kernel.org>
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     arch/mips/include/uapi/asm/kvm*
@@ -7577,7 +7591,7 @@ F:        arch/mips/include/asm/kvm*
 F:     arch/mips/kvm/
 
 KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
-M:     Alexander Graf <agraf@suse.com>
+M:     Paul Mackerras <paulus@ozlabs.org>
 L:     kvm-ppc@vger.kernel.org
 W:     http://www.linux-kvm.org/
 T:     git git://github.com/agraf/linux-2.6.git
@@ -7632,8 +7646,7 @@ F:        kernel/kexec*
 
 KEYS-ENCRYPTED
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
-M:     David Safford <safford@us.ibm.com>
-L:     linux-security-module@vger.kernel.org
+L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
 F:     Documentation/security/keys/trusted-encrypted.rst
@@ -7641,9 +7654,8 @@ F:        include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
-M:     David Safford <safford@us.ibm.com>
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
-L:     linux-security-module@vger.kernel.org
+L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
 F:     Documentation/security/keys/trusted-encrypted.rst
@@ -7751,6 +7763,11 @@ S:       Maintained
 F:     Documentation/scsi/53c700.txt
 F:     drivers/scsi/53c700*
 
+LEAKING_ADDRESSES
+M:     Tobin C. Harding <me@tobin.cc>
+S:     Maintained
+F:     scripts/leaking_addresses.pl
+
 LED SUBSYSTEM
 M:     Richard Purdie <rpurdie@rpsys.net>
 M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
@@ -8271,6 +8288,12 @@ L:       libertas-dev@lists.infradead.org
 S:     Orphan
 F:     drivers/net/wireless/marvell/libertas/
 
+MARVELL MACCHIATOBIN SUPPORT
+M:     Russell King <rmk@armlinux.org.uk>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+
 MARVELL MV643XX ETHERNET DRIVER
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     netdev@vger.kernel.org
@@ -8743,7 +8766,7 @@ Q:        http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
 MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     mlxsw@mellanox.com
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.mellanox.com
@@ -8892,7 +8915,7 @@ F:        Documentation/devicetree/bindings/media/meson-ao-cec.txt
 T:     git git://linuxtv.org/media_tree.git
 
 METAG ARCHITECTURE
-M:     James Hogan <james.hogan@imgtec.com>
+M:     James Hogan <jhogan@kernel.org>
 L:     linux-metag@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 S:     Odd Fixes
@@ -8993,7 +9016,7 @@ F:        Documentation/mips/
 F:     arch/mips/
 
 MIPS BOSTON DEVELOPMENT BOARD
-M:     Paul Burton <paul.burton@imgtec.com>
+M:     Paul Burton <paul.burton@mips.com>
 L:     linux-mips@linux-mips.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@ -9003,7 +9026,7 @@ F:        drivers/clk/imgtec/clk-boston.c
 F:     include/dt-bindings/clock/boston-clock.h
 
 MIPS GENERIC PLATFORM
-M:     Paul Burton <paul.burton@imgtec.com>
+M:     Paul Burton <paul.burton@mips.com>
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     arch/mips/generic/
@@ -9019,7 +9042,7 @@ F:        drivers/*/*loongson1*
 F:     drivers/*/*/*loongson1*
 
 MIPS RINT INSTRUCTION EMULATION
-M:     Aleksandar Markovic <aleksandar.markovic@imgtec.com>
+M:     Aleksandar Markovic <aleksandar.markovic@mips.com>
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     arch/mips/math-emu/sp_rint.c
@@ -9199,12 +9222,6 @@ F:       include/linux/dt-bindings/mux/
 F:     include/linux/mux/
 F:     drivers/mux/
 
-MULTISOUND SOUND DRIVER
-M:     Andrew Veliath <andrewtv@usa.net>
-S:     Maintained
-F:     Documentation/sound/oss/MultiSound
-F:     sound/oss/msnd*
-
 MULTITECH MULTIPORT CARD (ISICOM)
 S:     Orphan
 F:     drivers/tty/isicom.c
@@ -9213,7 +9230,6 @@ F:        include/linux/isicom.h
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 M:     Bin Liu <b-liu@ti.com>
 L:     linux-usb@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:     Maintained
 F:     drivers/usb/musb/
 
@@ -9361,7 +9377,7 @@ NETWORK BLOCK DEVICE (NBD)
 M:     Josef Bacik <jbacik@fb.com>
 S:     Maintained
 L:     linux-block@vger.kernel.org
-L:     nbd-general@lists.sourceforge.net
+L:     nbd@other.debian.org
 F:     Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
 F:     include/uapi/linux/nbd.h
@@ -10032,7 +10048,11 @@ T:     git git://github.com/openrisc/linux.git
 L:     openrisc@lists.librecores.org
 W:     http://openrisc.io
 S:     Maintained
+F:     Documentation/devicetree/bindings/openrisc/
+F:     Documentation/openrisc/
 F:     arch/openrisc/
+F:     drivers/irqchip/irq-ompic.c
+F:     drivers/irqchip/irq-or1k-*
 
 OPENVSWITCH
 M:     Pravin Shelar <pshelar@nicira.com>
@@ -10050,7 +10070,7 @@ M:      Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
-F:     drivers/base/power/opp/
+F:     drivers/opp/
 F:     include/linux/pm_opp.h
 F:     Documentation/power/opp.txt
 F:     Documentation/devicetree/bindings/opp/
@@ -10180,7 +10200,6 @@ F:      Documentation/parport*.txt
 
 PARAVIRT_OPS INTERFACE
 M:     Juergen Gross <jgross@suse.com>
-M:     Chris Wright <chrisw@sous-sol.org>
 M:     Alok Kataria <akataria@vmware.com>
 M:     Rusty Russell <rusty@rustcorp.com.au>
 L:     virtualization@lists.linux-foundation.org
@@ -10338,7 +10357,6 @@ F:      drivers/pci/host/vmd.c
 
 PCI DRIVER FOR MICROSEMI SWITCHTEC
 M:     Kurt Schwemmer <kurt.schwemmer@microsemi.com>
-M:     Stephen Bates <stephen.bates@microsemi.com>
 M:     Logan Gunthorpe <logang@deltatee.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
@@ -10403,6 +10421,7 @@ F:      drivers/pci/dwc/*keystone*
 
 PCI ENDPOINT SUBSYSTEM
 M:     Kishon Vijay Abraham I <kishon@ti.com>
+M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 L:     linux-pci@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
 S:     Supported
@@ -10454,6 +10473,15 @@ F:     include/linux/pci*
 F:     arch/x86/pci/
 F:     arch/x86/kernel/quirks.c
 
+PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
+M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+L:     linux-pci@vger.kernel.org
+Q:     http://patchwork.ozlabs.org/project/linux-pci/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
+S:     Supported
+F:     drivers/pci/host/
+F:     drivers/pci/dwc/
+
 PCIE DRIVER FOR AXIS ARTPEC
 M:     Niklas Cassel <niklas.cassel@axis.com>
 M:     Jesper Nilsson <jesper.nilsson@axis.com>
@@ -10473,7 +10501,6 @@ F:      drivers/pci/host/pci-thunder-*
 
 PCIE DRIVER FOR HISILICON
 M:     Zhou Wang <wangzhou1@hisilicon.com>
-M:     Gabriele Paoloni <gabriele.paoloni@huawei.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
@@ -10560,6 +10587,8 @@ M:      Peter Zijlstra <peterz@infradead.org>
 M:     Ingo Molnar <mingo@redhat.com>
 M:     Arnaldo Carvalho de Melo <acme@kernel.org>
 R:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
+R:     Jiri Olsa <jolsa@redhat.com>
+R:     Namhyung Kim <namhyung@kernel.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Supported
@@ -10683,10 +10712,9 @@ S:     Maintained
 F:     drivers/pinctrl/spear/
 
 PISTACHIO SOC SUPPORT
-M:     James Hartley <james.hartley@imgtec.com>
-M:     Ionela Voinescu <ionela.voinescu@imgtec.com>
+M:     James Hartley <james.hartley@sondrel.com>
 L:     linux-mips@linux-mips.org
-S:     Maintained
+S:     Odd Fixes
 F:     arch/mips/pistachio/
 F:     arch/mips/include/asm/mach-pistachio/
 F:     arch/mips/boot/dts/img/pistachio*
@@ -10890,7 +10918,7 @@ S:      Maintained
 F:     drivers/block/ps3vram.c
 
 PSAMPLE PACKET SAMPLING SUPPORT:
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     Yotam Gigi <yotam.gi@gmail.com>
 S:     Maintained
 F:     net/psample
 F:     include/net/psample.h
@@ -11033,7 +11061,6 @@ F:      drivers/mtd/nand/pxa3xx_nand.c
 
 QAT DRIVER
 M:     Giovanni Cabiddu <giovanni.cabiddu@intel.com>
-M:     Salvatore Benedetto <salvatore.benedetto@intel.com>
 L:     qat-linux@intel.com
 S:     Supported
 F:     drivers/crypto/qat/
@@ -11514,6 +11541,16 @@ S:     Maintained
 F:     drivers/mtd/nand/r852.c
 F:     drivers/mtd/nand/r852.h
 
+RISC-V ARCHITECTURE
+M:     Palmer Dabbelt <palmer@sifive.com>
+M:     Albert Ou <albert@sifive.com>
+L:     patches@groups.riscv.org
+T:     git https://github.com/riscv/riscv-linux
+S:     Supported
+F:     arch/riscv/
+K:     riscv
+N:     riscv
+
 ROCCAT DRIVERS
 M:     Stefan Achatz <erazor_de@users.sourceforge.net>
 W:     http://sourceforge.net/projects/roccat/
@@ -11766,7 +11803,7 @@ L:      linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/exynos-rng.c
-F:     Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
+F:     Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
 
 SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jingoohan1@gmail.com>
@@ -12049,10 +12086,15 @@ L:    linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci-spear.c
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
+M:     Kishon Vijay Abraham I <kishon@ti.com>
+L:     linux-mmc@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/sdhci-omap.c
+
 SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
 M:     Scott Bauer <scott.bauer@intel.com>
 M:     Jonathan Derrick <jonathan.derrick@intel.com>
-M:     Rafael Antognolli <rafael.antognolli@intel.com>
 L:     linux-block@vger.kernel.org
 S:     Supported
 F:     block/sed*
@@ -12453,7 +12495,10 @@ M:     Shaohua Li <shli@kernel.org>
 L:     linux-raid@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 S:     Supported
-F:     drivers/md/
+F:     drivers/md/Makefile
+F:     drivers/md/Kconfig
+F:     drivers/md/md*
+F:     drivers/md/raid*
 F:     include/linux/raid/
 F:     include/uapi/linux/raid/
 
@@ -12906,9 +12951,16 @@ F:     arch/arc/plat-axs10x
 F:     arch/arc/boot/dts/ax*
 F:     Documentation/devicetree/bindings/arc/axs10*
 
+SYNOPSYS DESIGNWARE APB GPIO DRIVER
+M:     Hoan Tran <hotran@apm.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-dwapb.c
+F:     Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
+
 SYNOPSYS DESIGNWARE DMAC DRIVER
 M:     Viresh Kumar <vireshk@kernel.org>
-M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
 F:     include/linux/dma/dw.h
 F:     include/linux/platform_data/dma-dw.h
@@ -12938,9 +12990,9 @@ F:      drivers/mmc/host/dw_mmc*
 SYNOPSYS HSDK RESET CONTROLLER DRIVER
 M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 S:     Supported
-F:     drivers/reset/reset-hsdk-v1.c
-F:     include/dt-bindings/reset/snps,hsdk-v1-reset.h
-F:     Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
+F:     drivers/reset/reset-hsdk.c
+F:     include/dt-bindings/reset/snps,hsdk-reset.h
+F:     Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
 
 SYSTEM CONFIGURATION (SYSCON)
 M:     Lee Jones <lee.jones@linaro.org>
@@ -13599,23 +13651,14 @@ F:    drivers/platform/x86/toshiba-wmi.c
 
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
-M:     Marcel Selhorst <tpmdd@selhorst.net>
 M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
-W:     http://tpmdd.sourceforge.net
-L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
-Q:     https://patchwork.kernel.org/project/tpmdd-devel/list/
+L:     linux-integrity@vger.kernel.org
+Q:     https://patchwork.kernel.org/project/linux-integrity/list/
 T:     git git://git.infradead.org/users/jjs/linux-tpmdd.git
 S:     Maintained
 F:     drivers/char/tpm/
 
-TPM IBM_VTPM DEVICE DRIVER
-M:     Ashley Lai <ashleydlai@gmail.com>
-W:     http://tpmdd.sourceforge.net
-L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/char/tpm/tpm_ibmvtpm*
-
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     Ingo Molnar <mingo@redhat.com>
@@ -13756,7 +13799,7 @@ UDRAW TABLET
 M:     Bastien Nocera <hadess@hadess.net>
 L:     linux-input@vger.kernel.org
 S:     Maintained
-F:     drivers/hid/hid-udraw.c
+F:     drivers/hid/hid-udraw-ps3.c
 
 UFS FILESYSTEM
 M:     Evgeniy Dushistov <dushistov@mail.ru>
@@ -14325,6 +14368,7 @@ L:      virtualization@lists.linux-foundation.org
 L:     kvm@vger.kernel.org
 S:     Supported
 F:     drivers/s390/virtio/
+F:     arch/s390/include/uapi/asm/virtio-ccw.h
 
 VIRTIO GPU DRIVER
 M:     David Airlie <airlied@linux.ie>
@@ -14598,6 +14642,7 @@ F:      Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 F:     Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 F:     Documentation/devicetree/bindings/mfd/arizona.txt
 F:     Documentation/devicetree/bindings/mfd/wm831x.txt
+F:     Documentation/devicetree/bindings/sound/wlf,arizona.txt
 F:     arch/arm/mach-s3c64xx/mach-crag6410*
 F:     drivers/clk/clk-wm83*.c
 F:     drivers/extcon/extcon-arizona.c