Merge remote-tracking branch 'mmc/next'
[linux] / MAINTAINERS
index 1ae057a..5767f9c 100644 (file)
@@ -365,6 +365,7 @@ M:  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 M:     Hanjun Guo <hanjun.guo@linaro.org>
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-acpi@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/acpi/arm64
 
@@ -409,10 +410,9 @@ F: drivers/platform/x86/wmi.c
 F:     include/uapi/linux/wmi.h
 
 AD1889 ALSA SOUND DRIVER
-M:     Thibaut Varene <T-Bone@parisc-linux.org>
-W:     http://wiki.parisc-linux.org/AD1889
+W:     https://parisc.wiki.kernel.org/index.php/AD1889
 L:     linux-parisc@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     sound/pci/ad1889.*
 
 AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
@@ -1133,13 +1133,26 @@ S:      Supported
 F:     drivers/gpu/drm/arm/hdlcd_*
 F:     Documentation/devicetree/bindings/display/arm,hdlcd.txt
 
+ARM KOMEDA DRM-KMS DRIVER
+M:     James (Qian) Wang <james.qian.wang@arm.com>
+M:     Liviu Dudau <liviu.dudau@arm.com>
+L:     Mali DP Maintainers <malidp@foss.arm.com>
+S:     Supported
+T:     git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
+F:     drivers/gpu/drm/arm/display/include/
+F:     drivers/gpu/drm/arm/display/komeda/
+F:     Documentation/devicetree/bindings/display/arm/arm,komeda.txt
+F:     Documentation/gpu/komeda-kms.rst
+
 ARM MALI-DP DRM DRIVER
 M:     Liviu Dudau <liviu.dudau@arm.com>
 M:     Brian Starkey <brian.starkey@arm.com>
-M:     Mali DP Maintainers <malidp@foss.arm.com>
+L:     Mali DP Maintainers <malidp@foss.arm.com>
 S:     Supported
+T:     git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
 F:     drivers/gpu/drm/arm/
 F:     Documentation/devicetree/bindings/display/arm,malidp.txt
+F:     Documentation/gpu/afbc.rst
 
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <spyro@f2s.com>
@@ -1159,7 +1172,7 @@ F:        arch/arm*/include/asm/hw_breakpoint.h
 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/arm/pmu.yaml
 F:     Documentation/devicetree/bindings/perf/
 
 ARM PORT
@@ -1531,21 +1544,14 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:     Shawn Guo <shawnguo@kernel.org>
 M:     Sascha Hauer <s.hauer@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
-R:     Fabio Estevam <fabio.estevam@nxp.com>
+R:     Fabio Estevam <festevam@gmail.com>
 R:     NXP Linux Team <linux-imx@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-F:     arch/arm/mach-imx/
-F:     arch/arm/mach-mxs/
-F:     arch/arm/boot/dts/imx*
-F:     arch/arm/configs/imx*_defconfig
-F:     arch/arm64/boot/dts/freescale/imx*
-F:     drivers/clk/imx/
-F:     drivers/firmware/imx/
-F:     drivers/soc/imx/
-F:     include/linux/firmware/imx/
-F:     include/soc/imx/
+N:     imx
+N:     mxs
+X:     drivers/media/i2c/
 
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
 M:     Shawn Guo <shawnguo@kernel.org>
@@ -1737,6 +1743,7 @@ F:        arch/arm/configs/mvebu_*_defconfig
 F:     arch/arm/mach-mvebu/
 F:     arch/arm64/boot/dts/marvell/armada*
 F:     drivers/cpufreq/armada-37xx-cpufreq.c
+F:     drivers/cpufreq/armada-8k-cpufreq.c
 F:     drivers/cpufreq/mvebu-cpufreq.c
 F:     drivers/irqchip/irq-armada-370-xp.c
 F:     drivers/irqchip/irq-mvebu-*
@@ -1948,19 +1955,37 @@ M:      David Brown <david.brown@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/soc/qcom/
+F:     Documentation/devicetree/bindings/*/qcom*
 F:     arch/arm/boot/dts/qcom-*.dts
 F:     arch/arm/boot/dts/qcom-*.dtsi
 F:     arch/arm/mach-qcom/
-F:     arch/arm64/boot/dts/qcom/*
+F:     arch/arm64/boot/dts/qcom/
+F:     drivers/*/qcom/
+F:     drivers/*/qcom*
+F:     drivers/*/*/qcom/
+F:     drivers/*/*/qcom*
+F:     drivers/*/pm8???-*
+F:     drivers/bluetooth/btqcomsmd.c
+F:     drivers/clocksource/timer-qcom.c
+F:     drivers/extcon/extcon-qcom*
+F:     drivers/iommu/msm*
 F:     drivers/i2c/busses/i2c-qup.c
-F:     drivers/clk/qcom/
-F:     drivers/dma/qcom/
-F:     drivers/soc/qcom/
+F:     drivers/i2c/busses/i2c-qcom-geni.c
+F:     drivers/mfd/ssbi.c
+F:     drivers/mmc/host/mmci_qcom*
+F:     drivers/mmc/host/sdhci_msm.c
+F:     drivers/pci/controller/dwc/pcie-qcom.c
+F:     drivers/phy/qualcomm/
+F:     drivers/power/*/msm*
+F:     drivers/reset/reset-qcom-*
+F:     drivers/scsi/ufs/ufs-qcom.*
 F:     drivers/spi/spi-qup.c
+F:     drivers/spi/spi-geni-qcom.c
+F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/tty/serial/msm_serial.c
-F:     drivers/*/pm8???-*
-F:     drivers/mfd/ssbi.c
-F:     drivers/firmware/qcom_scm*
+F:     drivers/usb/dwc3/dwc3-qcom.c
+F:     include/dt-bindings/*/qcom*
+F:     include/linux/*/qcom*
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
@@ -1997,7 +2022,7 @@ Q:        http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
 F:     arch/arm64/boot/dts/renesas/
-F:     Documentation/devicetree/bindings/arm/shmobile.txt
+F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -2084,8 +2109,9 @@ F:        drivers/media/platform/s5p-cec/
 F:     Documentation/devicetree/bindings/media/s5p-cec.txt
 
 ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
-M:     Andrzej Pietrasiewicz <andrzej.p@samsung.com>
+M:     Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
 M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -2109,6 +2135,8 @@ Q:        http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
 F:     arch/arm/boot/dts/emev2*
+F:     arch/arm/boot/dts/gr-peach*
+F:     arch/arm/boot/dts/iwg20d-q7*
 F:     arch/arm/boot/dts/r7s*
 F:     arch/arm/boot/dts/r8a*
 F:     arch/arm/boot/dts/r9a*
@@ -2116,7 +2144,7 @@ F:        arch/arm/boot/dts/sh*
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
 F:     arch/arm/mach-shmobile/
-F:     Documentation/devicetree/bindings/arm/shmobile.txt
+F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -2848,6 +2876,9 @@ 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>
+R:     Martin KaFai Lau <kafai@fb.com>
+R:     Song Liu <songliubraving@fb.com>
+R:     Yonghong Song <yhs@fb.com>
 L:     netdev@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@ -2873,6 +2904,8 @@ F:        samples/bpf/
 F:     tools/bpf/
 F:     tools/lib/bpf/
 F:     tools/testing/selftests/bpf/
+K:     bpf
+N:     bpf
 
 BPF JIT for ARM
 M:     Shubham Bansal <illusionist.neo@gmail.com>
@@ -2907,6 +2940,12 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     arch/powerpc/net/
 
+BPF JIT for RISC-V (RV64G)
+M:     Björn Töpel <bjorn.topel@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     arch/riscv/net/
+
 BPF JIT for S390
 M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
@@ -3687,6 +3726,14 @@ N:       cros_ec
 N:     cros-ec
 F:     drivers/power/supply/cros_usbpd-charger.c
 
+CHROMEOS EC CODEC DRIVER
+M:     Cheng-Yi Chiang <cychiang@chromium.org>
+S:     Maintained
+R:     Enric Balletbo i Serra <enric.balletbo@collabora.com>
+R:     Guenter Roeck <groeck@chromium.org>
+F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+F:     sound/soc/codecs/cros_ec_codec.*
+
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:     Brian Austin <brian.austin@cirrus.com>
 M:     Paul Handrigan <Paul.Handrigan@cirrus.com>
@@ -3956,7 +4003,7 @@ M:        Viresh Kumar <viresh.kumar@linaro.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 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)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
 B:     https://bugzilla.kernel.org
 F:     Documentation/admin-guide/pm/cpufreq.rst
 F:     Documentation/admin-guide/pm/intel_pstate.rst
@@ -4016,6 +4063,7 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 B:     https://bugzilla.kernel.org
 F:     Documentation/admin-guide/pm/cpuidle.rst
+F:     Documentation/driver-api/pm/cpuidle.rst
 F:     drivers/cpuidle/*
 F:     include/linux/cpuidle.h
 
@@ -4123,7 +4171,7 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4152,7 +4200,7 @@ S:        Supported
 F:     drivers/crypto/chelsio
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4876,6 +4924,7 @@ DRM DRIVER FOR QXL VIRTUAL GPU
 M:     Dave Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     virtualization@lists.linux-foundation.org
+L:     spice-devel@lists.freedesktop.org
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/qxl/
@@ -4896,6 +4945,12 @@ S:       Orphan / Obsolete
 F:     drivers/gpu/drm/sis/
 F:     include/uapi/drm/sis_drm.h
 
+DRM DRIVER FOR SITRONIX ST7701 PANELS
+M:     Jagan Teki <jagan@amarulasolutions.com>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-sitronix-st7701.c
+F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
+
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -4912,6 +4967,13 @@ DRM DRIVER FOR TDFX VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/tdfx/
 
+DRM DRIVER FOR TPO TPG110 PANELS
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-tpo-tpg110.c
+F:     Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
+
 DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 M:     Dave Airlie <airlied@redhat.com>
 R:     Sean Paul <sean@poorly.run>
@@ -4920,6 +4982,16 @@ S:       Odd Fixes
 F:     drivers/gpu/drm/udl/
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
+DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
+M:     Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
+R:     Haneen Mohammed <hamohammed.sa@gmail.com>
+R:     Daniel Vetter <daniel@ffwll.ch>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+L:     dri-devel@lists.freedesktop.org
+F:     drivers/gpu/drm/vkms/
+F:     Documentation/gpu/vkms.rst
+
 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:     "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 M:     Thomas Hellstrom <thellstrom@vmware.com>
@@ -4989,7 +5061,6 @@ F:        Documentation/devicetree/bindings/display/atmel/
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR BRIDGE CHIPS
-M:     Archit Taneja <architt@codeaurora.org>
 M:     Andrzej Hajda <a.hajda@samsung.com>
 R:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 S:     Maintained
@@ -5144,7 +5215,7 @@ DRM DRIVERS FOR VIVANTE GPU IP
 M:     Lucas Stach <l.stach@pengutronix.de>
 R:     Russell King <linux+etnaviv@armlinux.org.uk>
 R:     Christian Gmeiner <christian.gmeiner@gmail.com>
-L:     etnaviv@lists.freedesktop.org
+L:     etnaviv@lists.freedesktop.org (moderated for non-subscribers)
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/etnaviv/
@@ -5882,6 +5953,7 @@ L:        linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/*
 F:     include/linux/fs.h
+F:     include/linux/fs_types.h
 F:     include/uapi/linux/fs.h
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
@@ -6024,6 +6096,12 @@ L:       linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/dma/fsldma.*
 
+FREESCALE ENETC ETHERNET DRIVERS
+M:     Claudiu Manoil <claudiu.manoil@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/enetc/
+
 FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 M:     Claudiu Manoil <claudiu.manoil@nxp.com>
 L:     netdev@vger.kernel.org
@@ -6088,6 +6166,7 @@ M:        Yangbo Lu <yangbo.lu@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/ptp/ptp_qoriq.c
+F:     drivers/ptp/ptp_qoriq_debugfs.c
 F:     include/linux/fsl/ptp_qoriq.h
 F:     Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
 
@@ -6146,7 +6225,7 @@ FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <timur@kernel.org>
 M:     Nicolin Chen <nicoleotsuka@gmail.com>
 M:     Xiubo Li <Xiubo.Lee@gmail.com>
-R:     Fabio Estevam <fabio.estevam@nxp.com>
+R:     Fabio Estevam <festevam@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
@@ -7698,7 +7777,6 @@ M:        Yong Zhi <yong.zhi@intel.com>
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 M:     Bingbu Cao <bingbu.cao@intel.com>
 R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
-R:     Jian Xu Zheng <jian.xu.zheng@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/pci/intel/ipu3/
@@ -9853,6 +9931,18 @@ F:       drivers/media/platform/meson/ao-cec.c
 F:     Documentation/devicetree/bindings/media/meson-ao-cec.txt
 T:     git git://linuxtv.org/media_tree.git
 
+MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
+M:     Liang Yang <liang.yang@amlogic.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/raw/meson_*
+F:     Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
+
+METHODE UDPU SUPPORT
+M:     Vladimir Vid <vladimir.vid@sartura.hr>
+S:     Maintained
+F:     arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <monstr@monstr.eu>
 W:     http://www.monstr.eu/fdt/
@@ -10577,6 +10667,7 @@ F:      Documentation/devicetree/bindings/net/dsa/
 F:     net/dsa/
 F:     include/net/dsa.h
 F:     include/linux/dsa/
+F:     include/linux/platform_data/dsa.h
 F:     drivers/net/dsa/
 
 NETWORKING [GENERAL]
@@ -10893,7 +10984,7 @@ F:      include/linux/nvmem-consumer.h
 F:     include/linux/nvmem-provider.h
 
 NXP SGTL5000 DRIVER
-M:     Fabio Estevam <fabio.estevam@nxp.com>
+M:     Fabio Estevam <festevam@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -11232,6 +11323,19 @@ S:     Maintained
 F:     drivers/media/i2c/ov7740.c
 F:     Documentation/devicetree/bindings/media/i2c/ov7740.txt
 
+OMNIVISION OV9640 SENSOR DRIVER
+M:     Petr Cvek <petrcvekcz@gmail.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/ov9640.*
+
+OMNIVISION OV8856 SENSOR DRIVER
+M:     Ben Kao <ben.kao@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov8856.c
+
 OMNIVISION OV9650 SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 R:     Akinobu Mita <akinobu.mita@gmail.com>
@@ -11481,7 +11585,7 @@ F:      Documentation/blockdev/paride.txt
 F:     drivers/block/paride/
 
 PARISC ARCHITECTURE
-M:     "James E.J. Bottomley" <jejb@parisc-linux.org>
+M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 M:     Helge Deller <deller@gmx.de>
 L:     linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
@@ -12372,6 +12476,7 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd Fixes
 F:     drivers/media/usb/pwc/*
+F:     include/trace/events/pwc.h
 
 PWM FAN DRIVER
 M:     Kamil Debski <kamil@wypas.org>
@@ -12597,11 +12702,11 @@ F:    Documentation/media/v4l-drivers/qcom_camss.rst
 F:     drivers/media/platform/qcom/camss/
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
-M:  Ilia Lin <ilia.lin@gmail.com>
-L:  linux-pm@vger.kernel.org
-S:  Maintained
-F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
-F:  drivers/cpufreq/qcom-cpufreq-kryo.c
+M:     Ilia Lin <ilia.lin@kernel.org>
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
+F:     drivers/cpufreq/qcom-cpufreq-kryo.c
 
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:     Timur Tabi <timur@kernel.org>
@@ -12609,6 +12714,14 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/qualcomm/emac/
 
+QUALCOMM ETHQOS ETHERNET DRIVER
+M:     Vinod Koul <vkoul@kernel.org>
+M:     Niklas Cassel <niklas.cassel@linaro.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+F:     Documentation/devicetree/bindings/net/qcom,dwmac.txt
+
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:     Alok Chauhan <alokc@codeaurora.org>
 M:     Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
@@ -12868,6 +12981,13 @@ F:     Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 F:     drivers/net/dsa/realtek-smi*
 F:     drivers/net/dsa/rtl83*
 
+REDPINE WIRELESS DRIVER
+M:     Amitkumar Karwar <amitkarwar@gmail.com>
+M:     Siva Rebbagondla <siva8118@gmail.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     drivers/net/wireless/rsi/
+
 REGISTER MAP ABSTRACTION
 M:     Mark Brown <broonie@kernel.org>
 L:     linux-kernel@vger.kernel.org
@@ -12958,6 +13078,7 @@ F:      drivers/reset/
 F:     Documentation/devicetree/bindings/reset/
 F:     include/dt-bindings/reset/
 F:     include/linux/reset.h
+F:     include/linux/reset/
 F:     include/linux/reset-controller.h
 
 RESTARTABLE SEQUENCES SUPPORT
@@ -13703,6 +13824,15 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/sfc/
 
+SFF/SFP/SFP+ MODULE SUPPORT
+M:     Russell King <linux@armlinux.org.uk>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/phylink.c
+F:     drivers/net/phy/sfp*
+F:     include/linux/phylink.h
+F:     include/linux/sfp.h
+
 SGI GRU DRIVER
 M:     Dimitri Sivanich <sivanich@sgi.com>
 S:     Maintained
@@ -14315,6 +14445,7 @@ F:      arch/arm/mach-spear/
 
 SPI NOR SUBSYSTEM
 M:     Marek Vasut <marek.vasut@gmail.com>
+M:     Tudor Ambarus <tudor.ambarus@microchip.com>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/