Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[sfrench/cifs-2.6.git] / MAINTAINERS
index 28314fdd716305ce46de5f02e39ccd9e12bc80c6..08360bb0468bed0f0f5764ae8ded3c5dfde46c7e 100644 (file)
@@ -813,6 +813,7 @@ W:  http://wiki.analog.com/
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/iio/*/ad*
+F:     drivers/iio/adc/ltc2497*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
 F:     drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -896,12 +897,19 @@ F:        arch/arm64/boot/dts/apm/
 APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 M:     Iyappan Subramanian <isubramanian@apm.com>
 M:     Keyur Chudgar <kchudgar@apm.com>
+M:     Quan Nguyen <qnguyen@apm.com>
 S:     Supported
 F:     drivers/net/ethernet/apm/xgene/
 F:     drivers/net/phy/mdio-xgene.c
 F:     Documentation/devicetree/bindings/net/apm-xgene-enet.txt
 F:     Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
 
+APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
+M:     Iyappan Subramanian <isubramanian@apm.com>
+M:     Keyur Chudgar <kchudgar@apm.com>
+S:     Supported
+F:     drivers/net/ethernet/apm/xgene-v2/
+
 APPLIED MICRO (APM) X-GENE SOC PMU
 M:     Tai Nguyen <ttnguyen@apm.com>
 S:     Supported
@@ -976,6 +984,7 @@ F:  arch/arm*/include/asm/perf_event.h
 F:     drivers/perf/*
 F:     include/linux/perf/arm_pmu.h
 F:     Documentation/devicetree/bindings/arm/pmu.txt
+F:     Documentation/devicetree/bindings/perf/
 
 ARM PORT
 M:     Russell King <linux@armlinux.org.uk>
@@ -1088,6 +1097,8 @@ L:        linux-arm-kernel@axis.com
 F:     arch/arm/mach-artpec
 F:     arch/arm/boot/dts/artpec6*
 F:     drivers/clk/axis
+F:     drivers/pinctrl/pinctrl-artpec*
+F:     Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
 
 ARM/ASPEED MACHINE SUPPORT
 M:     Joel Stanley <joel@jms.id.au>
@@ -2224,7 +2235,7 @@ ATMEL ISI DRIVER
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
-F:     drivers/media/platform/soc_camera/atmel-isi.c
+F:     drivers/media/platform/atmel/atmel-isi.c
 F:     include/media/atmel-isi.h
 
 ATMEL LCDFB DRIVER
@@ -2327,21 +2338,6 @@ S:       Maintained
 F:     drivers/auxdisplay/
 F:     include/linux/cfag12864b.h
 
-AVR32 ARCHITECTURE
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-W:     http://www.atmel.com/products/AVR32/
-W:     http://mirror.egtvedt.no/avr32linux.org/
-W:     http://avrfreaks.net/
-S:     Maintained
-F:     arch/avr32/
-
-AVR32/AT32AP MACHINE SUPPORT
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-S:     Maintained
-F:     arch/avr32/mach-at32ap/
-
 AX.25 NETWORK LAYER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-hams@vger.kernel.org
@@ -2544,6 +2540,14 @@ F:       block/
 F:     kernel/trace/blktrace.c
 F:     lib/sbitmap.c
 
+BFQ I/O SCHEDULER
+M:     Paolo Valente <paolo.valente@linaro.org>
+M:     Jens Axboe <axboe@kernel.dk>
+L:     linux-block@vger.kernel.org
+S:     Maintained
+F:     block/bfq-*
+F:     Documentation/block/bfq-iosched.txt
+
 BLOCK2MTD DRIVER
 M:     Joern Engel <joern@lazybastard.org>
 L:     linux-mtd@lists.infradead.org
@@ -2585,12 +2589,26 @@ F:      include/uapi/linux/if_bonding.h
 
 BPF (Safe dynamic programs and tools)
 M:     Alexei Starovoitov <ast@kernel.org>
+M:     Daniel Borkmann <daniel@iogearbox.net>
 L:     netdev@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
 S:     Supported
+F:     arch/x86/net/bpf_jit*
+F:     Documentation/networking/filter.txt
+F:     include/linux/bpf*
+F:     include/linux/filter.h
+F:     include/uapi/linux/bpf*
+F:     include/uapi/linux/filter.h
 F:     kernel/bpf/
-F:     tools/testing/selftests/bpf/
+F:     kernel/trace/bpf_trace.c
 F:     lib/test_bpf.c
+F:     net/bpf/
+F:     net/core/filter.c
+F:     net/sched/act_bpf.c
+F:     net/sched/cls_bpf.c
+F:     samples/bpf/
+F:     tools/net/bpf*
+F:     tools/testing/selftests/bpf/
 
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
@@ -2937,6 +2955,15 @@ W:       http://www.linux-c6x.org/wiki/index.php/Main_Page
 S:     Maintained
 F:     arch/c6x/
 
+CA8210 IEEE-802.15.4 RADIO DRIVER
+M:     Harry Morris <h.morris@cascoda.com>
+M:     linuxdev@cascoda.com
+L:     linux-wpan@vger.kernel.org
+W:     https://github.com/Cascoda/ca8210-linux.git
+S:     Maintained
+F:     drivers/net/ieee802154/ca8210.c
+F:     Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
+
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
 L:     linux-cachefs@redhat.com (moderated for non-subscribers)
@@ -3024,7 +3051,6 @@ CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
 M:     Kevin Tsai <ktsai@capellamicro.com>
 S:     Maintained
 F:     drivers/iio/light/cm*
-F:     Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst
 
 CAVIUM THUNDERX2 ARM64 SOC
 M:     Jayachandran C <jnair@caviumnetworks.com>
@@ -3041,6 +3067,14 @@ S:       Supported
 F:     drivers/i2c/busses/i2c-octeon*
 F:     drivers/i2c/busses/i2c-thunderx*
 
+CAVIUM MMC DRIVER
+M:     Jan Glauber <jglauber@cavium.com>
+M:     David Daney <david.daney@cavium.com>
+M:     Steven J. Hill <Steven.Hill@cavium.com>
+W:     http://www.cavium.com
+S:     Supported
+F:     drivers/mmc/host/cavium*
+
 CAVIUM LIQUIDIO NETWORK DRIVER
 M:     Derek Chickles <derek.chickles@caviumnetworks.com>
 M:     Satanand Burla <satananda.burla@caviumnetworks.com>
@@ -3066,7 +3100,7 @@ F:        drivers/net/ieee802154/cc2520.c
 F:     include/linux/spi/cc2520.h
 F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 
-CEC DRIVER
+CEC FRAMEWORK
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -3075,10 +3109,9 @@ S:       Supported
 F:     Documentation/media/kapi/cec-core.rst
 F:     Documentation/media/uapi/cec
 F:     drivers/media/cec/
-F:     drivers/media/cec-edid.c
 F:     drivers/media/rc/keymaps/rc-cec.c
 F:     include/media/cec.h
-F:     include/media/cec-edid.h
+F:     include/media/cec-notifier.h
 F:     include/uapi/linux/cec.h
 F:     include/uapi/linux/cec-funcs.h
 
@@ -3449,6 +3482,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 T:     git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 B:     https://bugzilla.kernel.org
 F:     Documentation/cpu-freq/
+F:     Documentation/devicetree/bindings/cpufreq/
 F:     drivers/cpufreq/
 F:     include/linux/cpufreq.h
 F:     tools/testing/selftests/cpufreq/
@@ -3852,6 +3886,12 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:     Maintained
 F:     drivers/usb/dwc3/
 
+DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
+M:     Andreas Klinger <ak@it-klinger.de>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/proximity/srf*.c
+
 DEVICE COREDUMP (DEV_COREDUMP)
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-kernel@vger.kernel.org
@@ -4097,6 +4137,18 @@ S:       Maintained
 F:     drivers/char/dtlk.c
 F:     include/linux/dtlk.h
 
+DPAA2 DATAPATH I/O (DPIO) DRIVER
+M:     Roy Pledge <Roy.Pledge@nxp.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-mc/bus/dpio
+
+DPAA2 ETHERNET DRIVER
+M:     Ioana Radulescu <ruxandra.radulescu@nxp.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-dpaa2/ethernet
+
 DPT_I2O SCSI RAID DRIVER
 M:     Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:     linux-scsi@vger.kernel.org
@@ -4144,6 +4196,7 @@ F:        Documentation/devicetree/bindings/video/
 F:     Documentation/gpu/
 F:     include/drm/
 F:     include/uapi/drm/
+F:     include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Daniel Vetter <daniel.vetter@intel.com>
@@ -4157,6 +4210,7 @@ F:        drivers/gpu/vga/
 F:     drivers/gpu/drm/*
 F:     include/drm/drm*
 F:     include/uapi/drm/drm*
+F:     include/linux/vga*
 
 DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 M:     Dave Airlie <airlied@redhat.com>
@@ -4172,7 +4226,7 @@ F:        drivers/gpu/drm/bridge/
 DRM DRIVER FOR BOCHS VIRTUAL GPU
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     virtualization@lists.linux-foundation.org
-T:     git git://git.kraxel.org/linux drm-qemu
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/bochs/
 
@@ -4180,7 +4234,7 @@ DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 M:     Dave Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     virtualization@lists.linux-foundation.org
-T:     git git://git.kraxel.org/linux drm-qemu
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Obsolete
 W:     https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 F:     drivers/gpu/drm/cirrus/
@@ -4237,6 +4291,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/atmel-hlcdc/
 F:     Documentation/devicetree/bindings/drm/atmel/
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR ALLWINNER A10
 M:     Maxime Ripard  <maxime.ripard@free-electrons.com>
@@ -4244,6 +4299,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/sun4i/
 F:     Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git
 
 DRM DRIVERS FOR AMLOGIC SOCS
 M:     Neil Armstrong <narmstrong@baylibre.com>
@@ -4253,6 +4309,9 @@ W:        http://linux-meson.com/
 S:     Supported
 F:     drivers/gpu/drm/meson/
 F:     Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+F:     Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+F:     Documentation/gpu/meson.rst
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR EXYNOS
 M:     Inki Dae <inki.dae@samsung.com>
@@ -4377,13 +4436,14 @@ S:      Supported
 F:     drivers/gpu/drm/rcar-du/
 F:     drivers/gpu/drm/shmobile/
 F:     include/linux/platform_data/shmob_drm.h
+F:     Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 F:     Documentation/devicetree/bindings/display/renesas,du.txt
 
 DRM DRIVER FOR QXL VIRTUAL GPU
 M:     Dave Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     virtualization@lists.linux-foundation.org
-T:     git git://git.kraxel.org/linux drm-qemu
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/qxl/
 F:     include/uapi/drm/qxl_drm.h
@@ -4394,6 +4454,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/rockchip/
 F:     Documentation/devicetree/bindings/display/rockchip/
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVER FOR SAVAGE VIDEO CARDS
 S:     Orphan / Obsolete
@@ -4409,7 +4470,7 @@ DRM DRIVERS FOR STI
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 M:     Vincent Abriou <vincent.abriou@st.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git http://git.linaro.org/people/benjamin.gaignard/kernel.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/sti
 F:     Documentation/devicetree/bindings/display/st,stih4xx.txt
@@ -4452,6 +4513,7 @@ S:        Supported
 F:     drivers/gpu/drm/vc4/
 F:     include/uapi/drm/vc4_drm.h
 F:     Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR TI OMAP
 M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
@@ -4474,6 +4536,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/zte/
 F:     Documentation/devicetree/bindings/display/zte,vou.txt
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
@@ -4693,6 +4756,7 @@ L:        linux-edac@vger.kernel.org
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     drivers/edac/octeon_edac*
+F:     drivers/edac/thunderx_edac*
 
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
@@ -5115,7 +5179,6 @@ F:        include/uapi/linux/firewire*.h
 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
@@ -5145,13 +5208,15 @@ F:      include/linux/ipmi-fru.h
 K:     fmc_d.*register
 
 FPGA MANAGER FRAMEWORK
-M:     Alan Tull <atull@opensource.altera.com>
+M:     Alan Tull <atull@kernel.org>
 R:     Moritz Fischer <moritz.fischer@ettus.com>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
+F:     Documentation/fpga/
+F:     Documentation/devicetree/bindings/fpga/
 F:     drivers/fpga/
-F:     include/linux/fpga/fpga-mgr.h
+F:     include/linux/fpga/
 W:     http://www.rocketboards.org
 
 FPU EMULATOR
@@ -5263,6 +5328,7 @@ M:        Scott Wood <oss@buserror.net>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/powerpc/fsl/
 F:     drivers/soc/fsl/
 F:     include/linux/fsl/
 
@@ -5408,6 +5474,23 @@ F:       fs/fuse/
 F:     include/uapi/linux/fuse.h
 F:     Documentation/filesystems/fuse.txt
 
+FUTEX SUBSYSTEM
+M:     Thomas Gleixner <tglx@linutronix.de>
+M:     Ingo Molnar <mingo@redhat.com>
+R:     Peter Zijlstra <peterz@infradead.org>
+R:     Darren Hart <dvhart@infradead.org>
+L:     linux-kernel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
+S:     Maintained
+F:     kernel/futex.c
+F:     kernel/futex_compat.c
+F:     include/asm-generic/futex.h
+F:     include/linux/futex.h
+F:     include/uapi/linux/futex.h
+F:     tools/testing/selftests/futex/
+F:     tools/perf/bench/futex*
+F:     Documentation/*futex*
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 M:     Rik Faith <faith@cs.unc.edu>
 L:     linux-scsi@vger.kernel.org
@@ -5850,6 +5933,13 @@ F:       drivers/block/cciss*
 F:     include/linux/cciss_ioctl.h
 F:     include/uapi/linux/cciss_ioctl.h
 
+OPA-VNIC DRIVER
+M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+M:     Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/ulp/opa_vnic
+
 HFI1 DRIVER
 M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
 M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
@@ -6012,7 +6102,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/device-drivers/serial-interfaces.rst
+F:     Documentation/driver-api/hsi.rst
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -6218,7 +6308,7 @@ F:        drivers/crypto/nx/nx_csbcpb.h
 F:     drivers/crypto/nx/nx_debugfs.h
 
 IBM Power 842 compression accelerator
-M:     Dan Streetman <ddstreet@ieee.org>
+M:     Haren Myneni <haren@us.ibm.com>
 S:     Supported
 F:     drivers/crypto/nx/Makefile
 F:     drivers/crypto/nx/Kconfig
@@ -6458,6 +6548,7 @@ W:        http://www.openfabrics.org/
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 S:     Supported
+F:     Documentation/devicetree/bindings/infiniband/
 F:     Documentation/infiniband/
 F:     drivers/infiniband/
 F:     include/uapi/linux/if_infiniband.h
@@ -6490,7 +6581,7 @@ INPUT MULTITOUCH (MT) PROTOCOL
 M:     Henrik Rydberg <rydberg@bitmath.org>
 L:     linux-input@vger.kernel.org
 S:     Odd fixes
-F:     Documentation/input/multi-touch-protocol.txt
+F:     Documentation/input/multi-touch-protocol.rst
 F:     drivers/input/input-mt.c
 K:     \b(ABS|SYN)_MT_
 
@@ -6771,6 +6862,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/iommu/
 F:     drivers/iommu/
+F:     include/linux/iommu.h
+F:     include/linux/iova.h
 
 IP MASQUERADING
 M:     Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@ -7177,6 +7270,7 @@ S:        Supported
 F:     Documentation/s390/kvm.txt
 F:     arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
+F:     arch/s390/mm/gmap.c
 
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 M:     Christoffer Dall <christoffer.dall@linaro.org>
@@ -7497,7 +7591,7 @@ Q:        http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
 S:     Supported
 F:     Documentation/ABI/stable/sysfs-firmware-opal-*
-F:     Documentation/devicetree/bindings/powerpc/opal/
+F:     Documentation/devicetree/bindings/powerpc/
 F:     Documentation/devicetree/bindings/rtc/rtc-opal.txt
 F:     Documentation/devicetree/bindings/i2c/i2c-opal.txt
 F:     Documentation/powerpc/
@@ -7713,6 +7807,14 @@ S:       Maintained
 F:     Documentation/hwmon/ltc4261
 F:     drivers/hwmon/ltc4261.c
 
+LTC4306 I2C MULTIPLEXER DRIVER
+M:     Michael Hennerich <michael.hennerich@analog.com>
+W:     http://ez.analog.com/community/linux-device-drivers
+L:     linux-i2c@vger.kernel.org
+S:     Supported
+F:     drivers/i2c/muxes/i2c-mux-ltc4306.c
+F:     Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt
+
 LTP (Linux Test Project)
 M:     Mike Frysinger <vapier@gentoo.org>
 M:     Cyril Hrubis <chrubis@suse.cz>
@@ -7859,7 +7961,7 @@ S:        Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:     Amitkumar Karwar <akarwar@marvell.com>
+M:     Amitkumar Karwar <amitkarwar@gmail.com>
 M:     Nishant Sarmukadam <nishants@marvell.com>
 M:     Ganapathi Bhat <gbhat@marvell.com>
 M:     Xinming Hu <huxm@marvell.com>
@@ -7878,6 +7980,13 @@ M:       Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
 F:     drivers/mmc/host/mvsdio.*
 
+MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
+M:     Hu Ziji <huziji@marvell.com>
+L:     linux-mmc@vger.kernel.org
+S:     Supported
+F:     drivers/mmc/host/sdhci-xenon*
+F:     Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
+
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
@@ -8083,6 +8192,7 @@ W:        https://linuxtv.org
 Q:     http://patchwork.kernel.org/project/linux-media/list/
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/media/
 F:     Documentation/media/
 F:     drivers/media/
 F:     drivers/staging/media/
@@ -8103,6 +8213,13 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/mediatek/
 
+MEDIATEK JPEG DRIVER
+M:     Rick Chang <rick.chang@mediatek.com>
+M:     Bin Liu <bin.liu@mediatek.com>
+S:     Supported
+F:     drivers/media/platform/mtk-jpeg/
+F:     Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
+
 MEDIATEK MEDIA DRIVER
 M:     Tiffany Lin <tiffany.lin@mediatek.com>
 M:     Andrew-CT Chen <andrew-ct.chen@mediatek.com>
@@ -8127,6 +8244,14 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mediatek/mt7601u/
 
+MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
+M:     Peter Senna Tschudin <peter.senna@collabora.com>
+M:     Martin Donnelly <martin.donnelly@ge.com>
+M:     Martyn Welch <martyn.welch@collabora.co.uk>
+S:     Maintained
+F:     drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+F:     Documentation/devicetree/bindings/video/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
+
 MEGARAID SCSI/SAS DRIVERS
 M:     Kashyap Desai <kashyap.desai@broadcom.com>
 M:     Sumit Saxena <sumit.saxena@broadcom.com>
@@ -8689,14 +8814,16 @@ F:      drivers/net/ethernet/neterion/
 NETFILTER
 M:     Pablo Neira Ayuso <pablo@netfilter.org>
 M:     Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+M:     Florian Westphal <fw@strlen.de>
 L:     netfilter-devel@vger.kernel.org
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
+W:     http://www.nftables.org/
 Q:     http://patchwork.ozlabs.org/project/netfilter-devel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
-S:     Supported
+S:     Maintained
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
 F:     include/net/netfilter/
@@ -8763,6 +8890,7 @@ W:        http://www.linuxfoundation.org/en/Net
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
+B:     mailto:netdev@vger.kernel.org
 S:     Maintained
 F:     net/
 F:     include/net/
@@ -8803,12 +8931,12 @@ F:      net/core/flow.c
 F:     net/xfrm/
 F:     net/key/
 F:     net/ipv4/xfrm*
-F:     net/ipv4/esp4.c
+F:     net/ipv4/esp4*
 F:     net/ipv4/ah4.c
 F:     net/ipv4/ipcomp.c
 F:     net/ipv4/ip_vti.c
 F:     net/ipv6/xfrm*
-F:     net/ipv6/esp6.c
+F:     net/ipv6/esp6*
 F:     net/ipv6/ah6.c
 F:     net/ipv6/ipcomp6.c
 F:     net/ipv6/ip6_vti.c
@@ -8862,8 +8990,6 @@ S:        Supported
 F:     drivers/net/ethernet/qlogic/netxen/
 
 NFC SUBSYSTEM
-M:     Lauro Ramos Venancio <lauro.venancio@openbossa.org>
-M:     Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:     Samuel Ortiz <sameo@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 L:     linux-nfc@lists.01.org (subscribers-only)
@@ -9037,7 +9163,6 @@ F:        drivers/nvme/target/fcloop.c
 
 NVMEM FRAMEWORK
 M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-M:     Maxime Ripard <maxime.ripard@free-electrons.com>
 S:     Maintained
 F:     drivers/nvmem/
 F:     Documentation/devicetree/bindings/nvmem/
@@ -9269,12 +9394,20 @@ M:      Harald Welte <laforge@gnumonks.org>
 S:     Maintained
 F:     drivers/char/pcmcia/cm4040_cs.*
 
+OMNIVISION OV5647 SENSOR DRIVER
+M:     Ramiro Oliveira <roliveir@synopsys.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov5647.c
+
 OMNIVISION OV7670 SENSOR DRIVER
 M:     Jonathan Corbet <corbet@lwn.net>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/i2c/ov7670.c
+F:     Documentation/devicetree/bindings/media/i2c/ov7670.txt
 
 ONENAND FLASH DRIVER
 M:     Kyungmin Park <kyungmin.park@samsung.com>
@@ -9918,6 +10051,8 @@ M:       Krzysztof Kozlowski <krzk@kernel.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 S:     Maintained
 F:     drivers/pinctrl/samsung/
 F:     include/dt-bindings/pinctrl/samsung.h
@@ -9985,7 +10120,6 @@ F:       drivers/scsi/pmcraid.*
 PMC SIERRA PM8001 DRIVER
 M:     Jack Wang <jinpu.wang@profitbricks.com>
 M:     lindar_liu@usish.com
-L:     pmchba@pmcs.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/pm8001/
@@ -10084,7 +10218,7 @@ W:      http://sourceforge.net/projects/accel-pptp
 PREEMPTIBLE KERNEL
 M:     Robert Love <rml@tech9.net>
 L:     kpreempt-tech@lists.sourceforge.net
-W:     ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
+W:     https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 S:     Supported
 F:     Documentation/preempt-locking.txt
 F:     include/linux/preempt.h
@@ -10221,6 +10355,8 @@ F:      include/linux/pwm.h
 F:     drivers/pwm/
 F:     drivers/video/backlight/pwm_bl.c
 F:     include/linux/pwm_backlight.h
+F:     drivers/gpio/gpio-mvebu.c
+F:     Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
 
 PXA2xx/PXA3xx SUPPORT
 M:     Daniel Mack <daniel@zonque.org>
@@ -10458,6 +10594,13 @@ L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/aty/aty128fb.c
 
+RAINSHADOW-CEC DRIVER
+M:     Hans Verkuil <hverkuil@xs4all.nl>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/usb/rainshadow-cec/*
+
 RALINK MIPS ARCHITECTURE
 M:     John Crispin <john@phrozen.org>
 L:     linux-mips@linux-mips.org
@@ -10871,6 +11014,16 @@ W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/iommu/s390-iommu.c
 
+S390 VFIO-CCW DRIVER
+M:     Cornelia Huck <cornelia.huck@de.ibm.com>
+M:     Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+L:     linux-s390@vger.kernel.org
+L:     kvm@vger.kernel.org
+S:     Supported
+F:     drivers/s390/cio/vfio_ccw*
+F:     Documentation/s390/vfio-ccw.txt
+F:     include/uapi/linux/vfio_ccw.h
+
 S3C24XX SD/MMC Driver
 M:     Ben Dooks <ben-linux@fluff.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -10918,6 +11071,14 @@ L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 F:     sound/soc/samsung/
 
+SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
+M:     Krzysztof Kozlowski <krzk@kernel.org>
+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
+
 SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jingoohan1@gmail.com>
 L:     linux-fbdev@vger.kernel.org
@@ -10942,6 +11103,14 @@ F:     Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
 F:     Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
 F:     Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
 
+SAMSUNG S5P Security SubSystem (SSS) DRIVER
+M:     Krzysztof Kozlowski <krzk@kernel.org>
+M:     Vladimir Zapolskiy <vz@mleia.com>
+L:     linux-crypto@vger.kernel.org
+L:     linux-samsung-soc@vger.kernel.org
+S:     Maintained
+F:     drivers/crypto/s5p-sss.c
+
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -11073,6 +11242,12 @@ F:     include/linux/dma/dw.h
 F:     include/linux/platform_data/dma-dw.h
 F:     drivers/dma/dw/
 
+SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
+M:     Jie Deng <jiedeng@synopsys.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/synopsys/
+
 SYNOPSYS DESIGNWARE I2C DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -11111,6 +11286,7 @@ F:      drivers/power/supply/bq27xxx_battery_i2c.c
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:     John Stultz <john.stultz@linaro.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
+R:     Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Supported
@@ -11370,11 +11546,11 @@ S:    Supported
 F:     drivers/net/ethernet/emulex/benet/
 
 EMULEX ONECONNECT ROCE DRIVER
-M:     Selvin Xavier <selvin.xavier@avagotech.com>
-M:     Devesh Sharma <devesh.sharma@avagotech.com>
+M:     Selvin Xavier <selvin.xavier@broadcom.com>
+M:     Devesh Sharma <devesh.sharma@broadcom.com>
 L:     linux-rdma@vger.kernel.org
-W:     http://www.emulex.com
-S:     Supported
+W:     http://www.broadcom.com
+S:     Odd Fixes
 F:     drivers/infiniband/hw/ocrdma/
 F:     include/uapi/rdma/ocrdma-abi.h
 
@@ -12176,12 +12352,19 @@ F:    Documentation/accounting/taskstats*
 F:     include/linux/taskstats*
 F:     kernel/taskstats.c
 
-TC CLASSIFIER
+TC subsystem
 M:     Jamal Hadi Salim <jhs@mojatatu.com>
+M:     Cong Wang <xiyou.wangcong@gmail.com>
+M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     include/net/pkt_cls.h
+F:     include/net/pkt_sched.h
+F:     include/net/tc_act/
 F:     include/uapi/linux/pkt_cls.h
+F:     include/uapi/linux/pkt_sched.h
+F:     include/uapi/linux/tc_act/
+F:     include/uapi/linux/tc_ematch/
 F:     net/sched/
 
 TCP LOW PRIORITY MODULE
@@ -12466,7 +12649,6 @@ F:      drivers/clk/ti/
 F:     include/linux/clk/ti.h
 
 TI ETHERNET SWITCH DRIVER (CPSW)
-M:     Mugunthan V N <mugunthanvnm@ti.com>
 R:     Grygorii Strashko <grygorii.strashko@ti.com>
 L:     linux-omap@vger.kernel.org
 L:     netdev@vger.kernel.org
@@ -13112,6 +13294,15 @@ F:     drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/
 
+USB TYPEC SUBSYSTEM
+M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-typec
+F:     Documentation/usb/typec.rst
+F:     drivers/usb/typec/
+F:     include/linux/usb/typec.h
+
 USB UHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
@@ -13261,6 +13452,14 @@ L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/platform/
 
+VGA_SWITCHEROO
+R:     Lukas Wunner <lukas@wunner.de>
+S:     Maintained
+F:     Documentation/gpu/vga-switcheroo.rst
+F:     drivers/gpu/vga/vga_switcheroo.c
+F:     include/linux/vga_switcheroo.h
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
 VIDEOBUF2 FRAMEWORK
 M:     Pawel Osciak <pawel@osciak.com>
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
@@ -13278,8 +13477,11 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     include/linux/virtio_vsock.h
 F:     include/uapi/linux/virtio_vsock.h
+F:     include/uapi/linux/vsockmon.h
+F:     net/vmw_vsock/af_vsock_tap.c
 F:     net/vmw_vsock/virtio_transport_common.c
 F:     net/vmw_vsock/virtio_transport.c
+F:     drivers/net/vsockmon.c
 F:     drivers/vhost/vsock.c
 F:     drivers/vhost/vsock.h
 
@@ -13307,7 +13509,7 @@ F:      drivers/virtio/
 F:     tools/virtio/
 F:     drivers/net/virtio_net.c
 F:     drivers/block/virtio_blk.c
-F:     include/linux/virtio_*.h
+F:     include/linux/virtio*.h
 F:     include/uapi/linux/virtio_*.h
 F:     drivers/crypto/virtio/
 
@@ -13325,7 +13527,7 @@ M:      David Airlie <airlied@linux.ie>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     dri-devel@lists.freedesktop.org
 L:     virtualization@lists.linux-foundation.org
-T:     git git://git.kraxel.org/linux drm-qemu
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/virtio/
 F:     include/uapi/linux/virtio_gpu.h
@@ -13395,6 +13597,14 @@ W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/platform/vivid/*
 
+VIMC VIRTUAL MEDIA CONTROLLER DRIVER
+M:     Helen Koike <helen.koike@collabora.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     https://linuxtv.org
+S:     Maintained
+F:     drivers/media/platform/vimc/*
+
 VLYNQ BUS
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     openwrt-devel@lists.openwrt.org (subscribers-only)
@@ -13603,6 +13813,7 @@ F:      Documentation/hwmon/wm83??
 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:     arch/arm/mach-s3c64xx/mach-crag6410*
 F:     drivers/clk/clk-wm83*.c
 F:     drivers/extcon/extcon-arizona.c
@@ -13619,12 +13830,14 @@ F:    drivers/mfd/cs47l24*
 F:     drivers/power/supply/wm83*.c
 F:     drivers/rtc/rtc-wm83*.c
 F:     drivers/regulator/wm8*.c
+F:     drivers/regulator/arizona*
 F:     drivers/video/backlight/wm83*_bl.c
 F:     drivers/watchdog/wm83*_wdt.c
 F:     include/linux/mfd/arizona/
 F:     include/linux/mfd/wm831x/
 F:     include/linux/mfd/wm8350/
 F:     include/linux/mfd/wm8400*
+F:     include/linux/regulator/arizona*
 F:     include/linux/wm97xx.h
 F:     include/sound/wm????.h
 F:     sound/soc/codecs/arizona.?
@@ -13824,7 +14037,7 @@ YEALINK PHONE DRIVER
 M:     Henk Vergonet <Henk.Vergonet@gmail.com>
 L:     usbb2k-api-dev@nongnu.org
 S:     Maintained
-F:     Documentation/input/yealink.txt
+F:     Documentation/input/yealink.rst
 F:     drivers/input/misc/yealink.*
 
 Z8530 DRIVER FOR AX.25